[Erp5-report] r35004 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed May 5 12:36:50 CEST 2010
Author: jerome
Date: Wed May 5 12:36:48 2010
New Revision: 35004
URL: http://svn.erp5.org?rev=35004&view=rev
Log:
export account type and financial section
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml
erp5/trunk/bt5/erp5_accounting/bt/comment
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml?rev=35004&r1=35003&r2=35004&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingLineReportLineList.xml [utf8] Wed May 5 12:36:48 2010
@@ -136,6 +136,16 @@
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 @@
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 @@
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 @@
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 @@
<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>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml?rev=35004&r1=35003&r2=35004&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingLineReportReportSection/listbox.xml [utf8] Wed May 5 12:36:48 2010
@@ -111,6 +111,14 @@
<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>
</tuple>
Modified: erp5/trunk/bt5/erp5_accounting/bt/comment
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/comment?rev=35004&r1=35003&r2=35004&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/comment [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/comment [utf8] Wed May 5 12:36:48 2010
@@ -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.
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=35004&r1=35003&r2=35004&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Wed May 5 12:36:48 2010
@@ -1,1 +1,1 @@
-1207
+1209
More information about the Erp5-report
mailing list