diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml index 0eb1fe41820769720f209eac501e1fd18b81e244..29f5a98613e97a51be41acbf1e28816343a5aad3 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml @@ -136,6 +136,16 @@ for delivery in delivery_list:\n for movement in delivery.getMovementList(portal_type=portal_type):\n \n if is_source:\n + node = movement.getSourceValue(portal_type=\'Account\')\n + node_title = \'\'\n + node_account_type_title = \'\'\n + node_financial_section_title = \'\'\n + if node is not None:\n + node_title = node.getTitle()\n + node_account_type_title = node.getAccountTypeTranslatedTitle()\n + node_financial_section_title = \\\n + node.getFinancialSectionTranslatedTitle()\n +\n line_list.append(Object(\n title=movement.hasTitle() and movement.getTitle() or\n delivery.getTitle(),\n @@ -144,8 +154,10 @@ for delivery in delivery_list:\n parent_description=delivery.getDescription(),\n parent_reference=delivery.getReference(),\n specific_reference=delivery.getSourceReference(),\n - node_reference=getAccountReference(movement.getSource(portal_type=\'Account\')),\n - node_title=movement.getSourceTitle(),\n + node_reference=getAccountReference(node),\n + node_title=node_title,\n + node_account_type_title=node_account_type_title,\n + node_financial_section_title=node_financial_section_title,\n section_title=movement.getSourceSectionTitle(),\n payment_title=getBankAccountTitle(movement.getSourcePaymentValue()),\n payment_mode=movement.getPaymentModeTranslatedTitle(),\n @@ -167,6 +179,16 @@ for delivery in delivery_list:\n translated_simulation_state_title=movement.getTranslatedSimulationStateTitle(),))\n \n if delivery.portal_type == \'Internal Invoice Transaction\' or not is_source:\n + node = movement.getDestinationValue(portal_type=\'Account\')\n + node_title = \'\'\n + node_account_type_title = \'\'\n + node_financial_section_title = \'\'\n + if node is not None:\n + node_title = node.getTitle()\n + node_account_type_title = node.getAccountTypeTranslatedTitle()\n + node_financial_section_title = \\\n + node.getFinancialSectionTranslatedTitle()\n +\n line_list.append(Object(\n title=movement.hasTitle() and movement.getTitle() or\n delivery.getTitle(),\n @@ -175,8 +197,10 @@ for delivery in delivery_list:\n parent_description=delivery.getDescription(),\n parent_reference=delivery.getReference(),\n specific_reference=delivery.getDestinationReference(),\n - node_reference=getAccountReference(movement.getDestination(portal_type=\'Account\')),\n - node_title=movement.getDestinationTitle(),\n + node_reference=getAccountReference(node),\n + node_title=node_title,\n + node_account_type_title=node_account_type_title,\n + node_financial_section_title=node_financial_section_title,\n section_title=movement.getDestinationSectionTitle(),\n payment_title=getBankAccountTitle(movement.getDestinationPaymentValue()),\n payment_mode=movement.getPaymentModeTranslatedTitle(),\n @@ -266,6 +290,11 @@ return line_list\n <string>delivery</string> <string>is_source</string> <string>movement</string> + <string>node</string> + <string>node_title</string> + <string>node_account_type_title</string> + <string>node_financial_section_title</string> + <string>None</string> </tuple> </value> </item> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml index b46b1bbcee2230786c972e9118d00036feebc807..cdee87a09d18d1170748b35e9fa2008a66d1e211 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml @@ -110,6 +110,14 @@ <string>node_title</string> <string>Account Name</string> </tuple> + <tuple> + <string>node_account_type_title</string> + <string>Account Type</string> + </tuple> + <tuple> + <string>node_financial_section_title</string> + <string>Financial Section</string> + </tuple> <tuple> <string>section_title</string> <string>Section</string> diff --git a/bt5/erp5_accounting/bt/comment b/bt5/erp5_accounting/bt/comment index 6f0bed66a79f514b4abecac0395e4add02073209..f58580ba25436685e1166073f57a2b25fd363d8a 100644 --- a/bt5/erp5_accounting/bt/comment +++ b/bt5/erp5_accounting/bt/comment @@ -1,2 +1,2 @@ -INSTALL: +INSTALL: to use erp5_accounting, you have to use a localized version to have a chart of account in the gap category (or create it manually) then you must specify in a user preference which Organisation and group is your current company and which accounting plan you want to use. \ No newline at end of file diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index b5811ff88316d41317df41d4c3840f3b722fe7d4..7862d759d520fe1beb2e379e1517aad57df92b54 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1207 \ No newline at end of file +1209 \ No newline at end of file