[Erp5-report] r36004 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jun 4 16:47:35 CEST 2010
Author: jerome
Date: Fri Jun 4 16:47:35 2010
New Revision: 36004
URL: http://svn.erp5.org?rev=36004&view=rev
Log:
properly implement GL by function and project
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummary.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml?rev=36004&r1=36003&r2=36004&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerReportSectionList.xml [utf8] Fri Jun 4 16:47:35 2010
@@ -96,27 +96,25 @@
movement_portal_type=portal.getPortalAccountingMovementTypeList(),\n
no_mirror_section_uid_cache=1,\n
hide_grouping=request.get(\'omit_grouping_reference\', False))\n
-\n
-if len(simulation_state) > 1:\n
- account_columns = (\n
+project = request.get(\'project\')\n
+if project:\n
+ params[\'project_uid\'] = portal.portal_categories.restrictedTraverse(project).getUid()\n
+function = request.get(\'function\')\n
+if function:\n
+ params[\'function_uid\'] = portal.portal_categories.restrictedTraverse(function).getUid()\n
+\n
+account_columns = (\n
(\'Movement_getSpecificReference\', \'Reference\'),\n
(\'Movement_getExplanationTitle\', \'Title\'),\n
(\'date\', \'Date\'),\n
(\'Movement_getExplanationTranslatedPortalType\', \'Type\'),\n
(\'Movement_getExplanationReference\', \'Invoice Number\'),\n
- (\'Movement_getMirrorSectionTitle\', \'Third Party\'),\n
- (\'getTranslatedSimulationStateTitle\', \'State\'),\n
- (\'debit\', \'Debit\'),\n
- (\'credit\', \'Credit\'),\n
- (\'running_total_price\', \'Net\'), )\n
-else:\n
- account_columns = (\n
- (\'Movement_getSpecificReference\', \'Reference\'),\n
- (\'Movement_getExplanationTitle\', \'Title\'),\n
- (\'date\', \'Date\'),\n
- (\'Movement_getExplanationTranslatedPortalType\', \'Type\'),\n
- (\'Movement_getExplanationReference\', \'Invoice Number\'),\n
- (\'Movement_getMirrorSectionTitle\', \'Third Party\'),\n
+ (\'Movement_getMirrorSectionTitle\', \'Third Party\'),)\n
+\n
+if len(simulation_state) > 1:\n
+ account_columns += (\n
+ (\'getTranslatedSimulationStateTitle\', \'State\'),)\n
+account_columns += (\n
(\'debit\', \'Debit\'),\n
(\'credit\', \'Credit\'),\n
(\'running_total_price\', \'Net\'), )\n
@@ -507,8 +505,11 @@
<string>_write_</string>
<string>dict</string>
<string>params</string>
+ <string>project</string>
+ <string>function</string>
+ <string>account_columns</string>
<string>len</string>
- <string>account_columns</string>
+ <string>_inplacevar_</string>
<string>traverse</string>
<string>account_name_cache</string>
<string>getAccountName</string>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummary.xml?rev=36004&r1=36003&r2=36004&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummary.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getGeneralLedgerSummary.xml [utf8] Fri Jun 4 16:47:35 2010
@@ -61,6 +61,10 @@
at_date=at_date,\n
portal_type=context.getPortalAccountingMovementTypeList(),\n
)\n
+if function_uid:\n
+ inventory_kw[\'function_uid\'] = function_uid\n
+if project_uid:\n
+ inventory_kw[\'project_uid\'] = project_uid\n
\n
if node_category:\n
# XXX if node category is passed, income or balance accounts are not\n
@@ -113,7 +117,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>section_uid, simulation_state, at_date, period_start_date, precision, node_category=None, from_date=\'ignored\', **kw</string> </value>
+ <value> <string>section_uid, simulation_state, at_date, period_start_date, precision, node_category=None, function_uid=None, project_uid=None, from_date=\'ignored\', **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -133,7 +137,7 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>7</int> </value>
+ <value> <int>9</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
@@ -145,6 +149,8 @@
<string>period_start_date</string>
<string>precision</string>
<string>node_category</string>
+ <string>function_uid</string>
+ <string>project_uid</string>
<string>from_date</string>
<string>kw</string>
<string>Products.PythonScripts.standard</string>
@@ -154,6 +160,7 @@
<string>getInventoryAssetPrice</string>
<string>dict</string>
<string>inventory_kw</string>
+ <string>_write_</string>
<string>_apply_</string>
<string>income_node_category</string>
<string>balance_node_category</string>
@@ -173,6 +180,8 @@
<value>
<tuple>
<none/>
+ <none/>
+ <none/>
<string>ignored</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=36004&r1=36003&r2=36004&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Fri Jun 4 16:47:35 2010
@@ -1,1 +1,1 @@
-1238
+1241
More information about the Erp5-report
mailing list