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

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Mar 28 11:50:57 CEST 2007


Author: kazuhiko
Date: Wed Mar 28 11:50:47 2007
New Revision: 13744

URL: http://svn.erp5.org?rev=13744&view=rev
Log:
use selection_name instead of selection.

Modified:
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceSummary.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statTotalSourceCredit.xml
    erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statTotalSourceDebit.xml
    erp5/trunk/bt5/erp5_accounting/bt/revision

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceSummary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceSummary.xml?rev=13744&r1=13743&r2=13744&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceSummary.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getTrialBalanceSummary.xml Wed Mar 28 11:50:47 2007
@@ -73,7 +73,8 @@
 from DateTime import DateTime\n
 from Products.ERP5Type.Document import newTempBase\n
 \n
-selection_params = selection.getParams()\n
+portal = context.getPortalObject()\n
+selection_params = portal.portal_selections.getSelectionParamsFor(selection_name)\n
 get_inventory_kw = {\n
     \'section_category\': selection_params.get(\'section_category\')\n
   , \'simulation_state\': selection_params.get(\'simulation_state\')\n
@@ -85,7 +86,6 @@
 at_date   = selection_params.get(\'at_date\', None)\n
 from_date = selection_params.get(\'from_date\', None)\n
 \n
-portal = context.getPortalObject()\n
 getInventory = portal.portal_simulation.getInventoryAssetPrice\n
 \n
 # FIXME: Here we do not want to sum all movement < 0, but sum the balances\n
@@ -140,7 +140,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>selection, **kw</string> </value>
+            <value> <string>selection, selection_name, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -160,26 +160,27 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>1</int> </value>
+                        <value> <int>2</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
                             <string>selection</string>
+                            <string>selection_name</string>
                             <string>kw</string>
                             <string>DateTime</string>
                             <string>Products.ERP5Type.Document</string>
                             <string>newTempBase</string>
                             <string>_getattr_</string>
+                            <string>context</string>
+                            <string>portal</string>
                             <string>selection_params</string>
                             <string>True</string>
                             <string>get_inventory_kw</string>
                             <string>None</string>
                             <string>at_date</string>
                             <string>from_date</string>
-                            <string>context</string>
-                            <string>portal</string>
                             <string>getInventory</string>
                             <string>opening_debit_balance</string>
                             <string>opening_credit_balance</string>

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statTotalSourceCredit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statTotalSourceCredit.xml?rev=13744&r1=13743&r2=13744&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statTotalSourceCredit.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statTotalSourceCredit.xml Wed Mar 28 11:50:47 2007
@@ -68,7 +68,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return - context.AccountModule_statBalance(brain, selection, omit_input=1, **kw) or 0\n
+            <value> <string>return - context.AccountModule_statBalance(brain=brain, selection_name=selection_name, omit_input=1, **kw) or 0\n
 </string> </value>
         </item>
         <item>
@@ -85,7 +85,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>selection, brain=None, **kw</string> </value>
+            <value> <string>selection, brain=None, selection_name=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -105,7 +105,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>2</int> </value>
+                        <value> <int>3</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -113,6 +113,7 @@
                           <tuple>
                             <string>selection</string>
                             <string>brain</string>
+                            <string>selection_name</string>
                             <string>kw</string>
                             <string>_apply_</string>
                             <string>_getattr_</string>

Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statTotalSourceDebit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statTotalSourceDebit.xml?rev=13744&r1=13743&r2=13744&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statTotalSourceDebit.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_statTotalSourceDebit.xml Wed Mar 28 11:50:47 2007
@@ -68,7 +68,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return context.AccountModule_statBalance(brain, selection, omit_output=1, float_value=1, **kw)\n
+            <value> <string>return context.AccountModule_statBalance(brain=brain, selection_name=selection_name, omit_output=1, float_value=1, **kw)\n
 </string> </value>
         </item>
         <item>
@@ -85,7 +85,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>selection, brain=None, **kw</string> </value>
+            <value> <string>selection, brain=None, selection_name=None, **kw</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -105,7 +105,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>2</int> </value>
+                        <value> <int>3</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -113,6 +113,7 @@
                           <tuple>
                             <string>selection</string>
                             <string>brain</string>
+                            <string>selection_name</string>
                             <string>kw</string>
                             <string>_apply_</string>
                             <string>_getattr_</string>

Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=13744&r1=13743&r2=13744&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Wed Mar 28 11:50:47 2007
@@ -1,1 +1,1 @@
-229
+230




More information about the Erp5-report mailing list