[Erp5-report] r37348 jerome - in /erp5/trunk/bt5/erp5_project: SkinTemplateItem/portal_skin...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jul 28 16:23:12 2010
New Revision: 37348

URL: http://svn.erp5.org?rev=37348&view=rev
Log:
Project transaction tab:
- don't filter by node category, show all categories and let the user select with domain tree
- use omit_asset_increase / omit_asset_decrease as we show asset prices

Modified:
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getAccountingTransactionList.xml
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statBalance.xml
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statCredit.xml
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statDebit.xml
    erp5/trunk/bt5/erp5_project/bt/revision

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getAccountingTransactionList.xml?rev=37348&r1=37347&r2=37348&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getAccountingTransactionList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getAccountingTransactionList.xml [utf8] Wed Jul 28 16:23:12 2010
@@ -56,10 +56,6 @@
             <value> <string>"""Returns Accounting Transactions related to the project.\n
 """\n
 kw[\'project_uid\'] = context.getUid()\n
-kw[\'node_category_strict_membership\'] = [\'account_type/expense\',\n
-                                         \'account_type/income\',\n
-                                         \'account_type/asset/receivable\',\n
-                                         \'account_type/liability/payable\']\n
 return context.Node_getAccountingTransactionList(**kw)\n
 </string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statBalance.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statBalance.xml?rev=37348&r1=37347&r2=37348&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statBalance.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statBalance.xml [utf8] Wed Jul 28 16:23:12 2010
@@ -55,11 +55,7 @@
             <key> <string>_body</string> </key>
             <value> <string>"""Total balance of all accounting transactions related to the project.\n
 """\n
-kw[\'project_uid\'] = context.getUid()\n
-kw[\'node_category_strict_membership\'] = [\'account_type/expense\',\n
-                                         \'account_type/income\',\n
-                                         \'account_type/asset/receivable\',\n
-                                         \'account_type/liability/payable\']\n
+kw[\'project_uid\'] = context.getUid() \n
 return context.Node_statAccountingBalance(**kw)\n
 </string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statCredit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statCredit.xml?rev=37348&r1=37347&r2=37348&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statCredit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statCredit.xml [utf8] Wed Jul 28 16:23:12 2010
@@ -56,11 +56,7 @@
             <value> <string>"""Total credit of all accounting transactions related to the project.\n
 """\n
 kw[\'project_uid\'] = context.getUid()\n
-kw[\'omit_input\'] = 1\n
-kw[\'node_category_strict_membership\'] = [\'account_type/expense\',\n
-                                         \'account_type/income\',\n
-                                         \'account_type/asset/receivable\',\n
-                                         \'account_type/liability/payable\']\n
+kw[\'omit_asset_increase\'] = 1\n
 # here, or 0 is to prevent displaying "- 0"\n
 return - context.Node_statAccountingBalance(**kw) or 0\n
 </string> </value>

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statDebit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statDebit.xml?rev=37348&r1=37347&r2=37348&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statDebit.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_statDebit.xml [utf8] Wed Jul 28 16:23:12 2010
@@ -56,11 +56,7 @@
             <value> <string>"""Total debit of all accounting transactions related to the project.\n
 """\n
 kw[\'project_uid\'] = context.getUid()\n
-kw[\'omit_output\'] = 1\n
-kw[\'node_category_strict_membership\'] = [\'account_type/expense\',\n
-                                         \'account_type/income\',\n
-                                         \'account_type/asset/receivable\',\n
-                                         \'account_type/liability/payable\']\n
+kw[\'omit_asset_decrease\'] = 1\n
 return context.Node_statAccountingBalance(**kw)\n
 </string> </value>
         </item>

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=37348&r1=37347&r2=37348&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision [utf8] Wed Jul 28 16:23:12 2010
@@ -1 +1 @@
-766
\ No newline at end of file
+767
\ No newline at end of file