[Erp5-report] r16582 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Sep 24 20:32:17 2007
New Revision: 16582

URL: http://svn.erp5.org?rev=16582&view=rev
Log:
for profit and loss line, take expense and income from the current period only.

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewBalanceSheetReport.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewBalanceSheetReport.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewBalanceSheetReport.xml?rev=16582&r1=16581&r2=16582&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewBalanceSheetReport.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewBalanceSheetReport.xml Mon Sep 24 20:32:17 2007
@@ -604,7 +604,7 @@
                   -->\n
                   <tal:block tal:condition=\'python: cat_level_2.getId() == "net_profit"\'>\n
                     <table:table-cell\n
-                      tal:define=\'value python: -getInventory(node_category=[node_category, "financial_section/income", "financial_section/expense"]);\n
+                      tal:define=\'value python: -getInventory(node_category=[node_category]) - getInventoryIncomeAccount(node_category=["financial_section/income", "financial_section/expense"]);\n
                                   global total_current_period python: total_current_period + value;\'\n
                       tal:attributes=\'office:value value;\n
                                       office:value-type python:value and "float" or "text";\'\n
@@ -656,7 +656,7 @@
                   -->\n
                   <tal:block tal:condition=\'python: cat_level_3.getId() == "net_profit"\'>\n
                     <table:table-cell\n
-                      tal:define=\'value python: -getInventory(node_category=[node_category, "financial_section/income", "financial_section/expense"]);\n
+                      tal:define=\'value python: -getInventory(node_category=[node_category]) - getInventoryIncomeAccount(node_category=["financial_section/income", "financial_section/expense"]);\n
                                   global total_current_period python: total_current_period + value;\'\n
                       tal:attributes=\'office:value value;\n
                                       office:value-type python:value and "float" or "text";\'\n

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=16582&r1=16581&r2=16582&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Mon Sep 24 20:32:17 2007
@@ -1,1 +1,1 @@
-419
+420