diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index b7e729a738e..7b9bdfa03b3 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -220,7 +220,7 @@ Display Account - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] Target Moves @@ -234,8 +234,8 @@ [[ get_fiscalyear(data) or '' ]] [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' 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') ]] + [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date @@ -253,7 +253,7 @@ - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml index 99a39c49321..620ec05b16a 100644 --- a/addons/account/report/account_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -174,15 +174,15 @@ Chart of Accounts Fiscal Year - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] Display Account Target Moves [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date End Date @@ -192,7 +192,7 @@ [[ formatLang(get_end_date(data),date=True) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period End Period diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml index 92125ce92dc..b2d54e33466 100644 --- a/addons/account/report/account_balance_sheet_horizontal.rml +++ b/addons/account/report/account_balance_sheet_horizontal.rml @@ -134,15 +134,15 @@ Chart of Accounts Fiscal Year - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] Display Account Target Moves [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date End Date @@ -152,7 +152,7 @@ [[ formatLang(get_end_date(data),date=True) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period End Period diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml index 534baf05abe..8150871a6ef 100644 --- a/addons/account/report/account_central_journal.rml +++ b/addons/account/report/account_central_journal.rml @@ -238,15 +238,15 @@ Chart of Accounts Fiscal Year Journal - Filter By [[get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] Target Moves [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] [[o.journal_id.name ]] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date End Date @@ -256,7 +256,7 @@ [[ formatLang(get_end_date(data),date=True) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period End Period diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml index 5ca6e828e49..61140331612 100644 --- a/addons/account/report/account_general_journal.rml +++ b/addons/account/report/account_general_journal.rml @@ -224,15 +224,15 @@ [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] Fiscal Year Journals - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] Target Moves [[ get_account(data) or removeParentNode('para') ]] [[ 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') ]] + [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date End Date @@ -242,7 +242,7 @@ [[ formatLang(get_end_date(data),date=True) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period End Period diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index d19afed52aa..7a6e2d485ca 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -353,7 +353,7 @@ Journals - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] Target Moves @@ -372,8 +372,8 @@ [[', '.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') ]] + [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date @@ -383,7 +383,7 @@ - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] [[ formatLang(get_start_date(data),date=True) ]] @@ -393,7 +393,7 @@ - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period @@ -403,7 +403,7 @@ - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] [[ get_start_period(data) or removeParentNode('para') ]] diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 7495d889b52..79003c5aaa6 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -373,7 +373,7 @@ Display Account - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] Entries Sorted By @@ -398,8 +398,8 @@ [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' 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') ]] + [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date @@ -409,7 +409,7 @@ - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] [[ formatLang(get_start_date(data),date=True) ]] @@ -419,7 +419,7 @@ - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period @@ -429,7 +429,7 @@ - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] [[ get_start_period(data) or removeParentNode('para') ]] diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 76bf1bb4bfa..2ebdc29047d 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -197,8 +197,8 @@ [[ get_account(data) or '' ]] [[ get_fiscalyear(data) or '' ]] [[o.journal_id.name ]] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date End Date @@ -208,7 +208,7 @@ [[ formatLang(get_end_date(data),date=True) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period End Period diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml index 8953aa8d1cf..cb3bbeb0921 100644 --- a/addons/account/report/account_partner_balance.rml +++ b/addons/account/report/account_partner_balance.rml @@ -187,7 +187,7 @@ Chart of Accounts Fiscal Year Journals - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] Partner's Target Moves @@ -196,8 +196,8 @@ [[ 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') ]] + [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date End Date @@ -207,7 +207,7 @@ [[ formatLang(get_end_date(data),date=True) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period End Period diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index 11d9f6eff1b..b81f6436a12 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -378,7 +378,7 @@ [[ data['form']['filter'] in ('filter_no','unreconciled') and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date @@ -388,7 +388,7 @@ - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] [[ formatLang(get_start_date(data),date=True) ]] @@ -398,7 +398,7 @@ - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period @@ -408,7 +408,7 @@ - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] [[ get_start_period(data) or removeParentNode('para') ]] diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index 54842096496..ff68c083087 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -379,7 +379,7 @@ [[ data['form']['filter'] in ('filter_no','unreconciled') and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date @@ -389,7 +389,7 @@ - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] [[ formatLang(get_start_date(data),date=True) ]] @@ -399,7 +399,7 @@ - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period @@ -409,7 +409,7 @@ - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] [[ get_start_period(data) or removeParentNode('para') ]] diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml index e4ed9139fa0..0918dcb2699 100644 --- a/addons/account/report/account_profit_horizontal.rml +++ b/addons/account/report/account_profit_horizontal.rml @@ -151,15 +151,15 @@ Chart of Accounts Fiscal Year - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] Display Account Target Moves [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date End Date @@ -169,7 +169,7 @@ [[ formatLang(get_end_date(data),date=True) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period End Period diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index 6e7ed374b75..28fe167aef5 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -174,15 +174,15 @@ Chart of Accounts Fiscal Year - Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] Display Account Target Moves [[ get_account(data) or removeParentNode('para') ]] [[ get_fiscalyear(data) or '' ]] - [[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] - [[ get_filter(data)=='Date' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] Start Date End Date @@ -192,7 +192,7 @@ [[ formatLang(get_end_date(data),date=True) ]] - [[ get_filter(data)=='Periods' or removeParentNode('blockTable') ]] + [[ data['form']['filter']=='filter_period' or removeParentNode('blockTable') ]] Start Period End Period