Commit f99bb250 authored by Jérome Perrin's avatar Jérome Perrin

accounting: finish renaming hide_grouping -> omit_grouping_reference

parent 2ee5f8f4
...@@ -51,7 +51,7 @@ params = dict(at_date=at_date, ...@@ -51,7 +51,7 @@ params = dict(at_date=at_date,
node_uid=traverse(node).getUid(), node_uid=traverse(node).getUid(),
simulation_state=simulation_state, simulation_state=simulation_state,
detailed_from_date_summary=detailed_from_date_summary, detailed_from_date_summary=detailed_from_date_summary,
hide_grouping=omit_grouping_reference, omit_grouping_reference=omit_grouping_reference,
from_date=None, from_date=None,
payment_uid=None, payment_uid=None,
mirror_section_uid=None,) mirror_section_uid=None,)
......
...@@ -93,7 +93,6 @@ default_selection_params = params.copy() ...@@ -93,7 +93,6 @@ default_selection_params = params.copy()
default_selection_params['period_start_date'] = period_start_date default_selection_params['period_start_date'] = period_start_date
default_selection_params['movement_portal_type'] = portal.getPortalAccountingMovementTypeList() default_selection_params['movement_portal_type'] = portal.getPortalAccountingMovementTypeList()
default_selection_params['no_mirror_section_uid_cache'] = 1 default_selection_params['no_mirror_section_uid_cache'] = 1
default_selection_params['hide_grouping'] = request.get('omit_grouping_reference', False) # XXX is this still used ?
# if user request report without grouping reference, don't show accounts that only have grouped lines in the period. # if user request report without grouping reference, don't show accounts that only have grouped lines in the period.
......
...@@ -35,7 +35,6 @@ params = { ...@@ -35,7 +35,6 @@ params = {
, 'simulation_state': simulation_state , 'simulation_state': simulation_state
} }
params['hide_grouping'] = request['omit_grouping_reference']
if from_date: if from_date:
params['from_date'] = from_date params['from_date'] = from_date
else : else :
...@@ -72,7 +71,7 @@ entity_columns = [ ...@@ -72,7 +71,7 @@ entity_columns = [
('running_total_price', 'Balance'), ('running_total_price', 'Balance'),
] ]
if not params['hide_grouping'] : if not request['omit_grouping_reference']:
entity_columns.append(('grouping_reference', entity_columns.append(('grouping_reference',
'Grouping Reference')) 'Grouping Reference'))
......
...@@ -88,7 +88,7 @@ period_start_date = params.pop('period_start_date', None) ...@@ -88,7 +88,7 @@ period_start_date = params.pop('period_start_date', None)
if is_pl_account and not from_date: if is_pl_account and not from_date:
from_date = period_start_date from_date = period_start_date
if portal.portal_selections.getSelectionParamsFor(selection_name).get('hide_grouping'): if portal.portal_selections.getSelectionParamsFor(selection_name).get('omit_grouping_reference'):
if params.get('at_date'): if params.get('at_date'):
params['grouping_query'] = ComplexQuery( params['grouping_query'] = ComplexQuery(
Query(grouping_reference=None), Query(grouping_reference=None),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment