diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAvailableGapList.py b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAvailableGapList.py index cbce5426e31ff6e5cf5384c9fd47af4ab57b6225..759a5dbff19aad58dc3623e0482817270a52dca2 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAvailableGapList.py +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAvailableGapList.py @@ -1,12 +1,12 @@ # Return the list of gap roots that can be used. -# gap category is typically organized such as : +# gap category is typically organized such as : # gap / country / gap_name # so we always use as "root" the category of depth 2. item_list = [('', '')] countries = context.portal_categories.gap.objectValues() -for country in countries : - for gap in country.objectValues() : +for country in countries: + for gap in country.objectValues(): path = gap.getRelativeUrl() item_list.append( ((country.getTranslatedTitle() + '/'+ gap.getTranslatedTitle()), diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountsReportSectionList.py b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountsReportSectionList.py index c043276fecc816cea80a7d43a5921d22f8c65d10..1e14c7cde43b3b7d1d8795f690c93b3fb70a4a22 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountsReportSectionList.py +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getBankAccountsReportSectionList.py @@ -12,12 +12,12 @@ from_date = request.get('from_date', None) result = [] params = { - 'to_date' : to_date, - 'section_category' : transaction_section_category, - 'simulation_state' : transaction_simulation_state, - 'accounting_transaction_line_currency' : None, - 'report_depth' : 5 - } + 'to_date': to_date, + 'section_category': transaction_section_category, + 'simulation_state': transaction_simulation_state, + 'accounting_transaction_line_currency': None, + 'report_depth': 5 +} if from_date: params['from_date'] = from_date @@ -25,34 +25,37 @@ if from_date: groupCategory = context.portal_categories.restrictedTraverse(transaction_section_category) entities = groupCategory.getGroupRelatedValueList(portal_type = ('Organisation', 'Person')) -entity_columns = ( ('title', 'Title'), - ('getStopDate', 'Date'), - ('reference', 'Invoice No'), - ('getDestinationSectionTitle', 'Third Party'), - ('source_reference', 'Reference'), - ('simulation_state', 'State'), - ('source_debit', 'Debit'), - ('source_credit', 'Credit'), - ('source_balance', 'Balance'), - ) +entity_columns = ( + ('title', 'Title'), + ('getStopDate', 'Date'), + ('reference', 'Invoice No'), + ('getDestinationSectionTitle', 'Third Party'), + ('source_reference', 'Reference'), + ('simulation_state', 'State'), + ('source_debit', 'Debit'), + ('source_credit', 'Credit'), + ('source_balance', 'Balance'), +) for entity in entities : - result.append( ReportSection(path=context.getPhysicalPath(), - title='Bank accounts for %s'%entity.getTitle(), - level=1, - form_id=None) ) + result.append( + ReportSection( + path=context.getPhysicalPath(), + title='Bank accounts for %s'%entity.getTitle(), + level=1, + form_id=None) ) + for bank in entity.searchFolder(portal_type='Bank Account'): o = bank.getObject() result.append( - ReportSection(title='%s (%s)'%(o.getTitle(), entity.getTitle()), - level=2, - path=o.getPhysicalPath(), - form_id='BankAccount_viewAccountingTransactionList', - ## XXX Here we must use accounting_selection, because stat scripts read this selection - selection_name = 'accounting_selection', - selection_params = params, - selection_columns = entity_columns - ) - ) + ReportSection( + title='%s (%s)'%(o.getTitle(), entity.getTitle()), + level=2, + path=o.getPhysicalPath(), + form_id='BankAccount_viewAccountingTransactionList', + ## XXX Here we must use accounting_selection, because stat scripts read this selection + selection_name = 'accounting_selection', + selection_params = params, + selection_columns = entity_columns,)) return result diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py index 7ce5bfa64667e4851af67d4b1579e161b8258656..755f07681f5f5613ec15ae8a417aef9675c456d5 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getOtherPartiesReportSectionList.py @@ -25,14 +25,14 @@ if role_filter_list == [''] : role_filter_list = None section_uid = context.Base_getSectionUidListForSectionCategory( - request['section_category'], - request['section_category_strict']) + request['section_category'], + request['section_category_strict']) result = [] params = { - 'at_date' : at_date - , 'section_uid': section_uid - , 'simulation_state': simulation_state + 'at_date': at_date, + 'section_uid': section_uid, + 'simulation_state': simulation_state } if from_date: @@ -59,16 +59,16 @@ if ledger: simulation_tool = portal.portal_simulation entity_columns = [ - ('date', 'Date'), - ('Movement_getExplanationTranslatedPortalType', 'Type'), - ('Movement_getNodeGapId', 'GAP'), - ('Movement_getExplanationReference', 'Invoice No'), - ('Movement_getExplanationTitle', 'Title'), - ('Movement_getSpecificReference', 'Reference'), - ('getTranslatedSimulationStateTitle', 'State'), - ('debit_price', 'Debit'), - ('credit_price', 'Credit'), - ('running_total_price', 'Balance'), + ('date', 'Date'), + ('Movement_getExplanationTranslatedPortalType', 'Type'), + ('Movement_getNodeGapId', 'GAP'), + ('Movement_getExplanationReference', 'Invoice No'), + ('Movement_getExplanationTitle', 'Title'), + ('Movement_getSpecificReference', 'Reference'), + ('getTranslatedSimulationStateTitle', 'State'), + ('debit_price', 'Debit'), + ('credit_price', 'Credit'), + ('running_total_price', 'Balance'), ] if not request['omit_grouping_reference']: