[Erp5-report] r19112 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Feb 6 19:17:33 CET 2008
Author: yusei
Date: Wed Feb 6 19:17:32 2008
New Revision: 19112
URL: http://svn.erp5.org?rev=19112&view=rev
Log:
tell datetime_search_keys argument explicitly.
Added:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.xml
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml?rev=19112&r1=19111&r2=19112&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_countAccountingTransactionList.xml Wed Feb 6 19:17:32 2008
@@ -77,11 +77,11 @@
ss_q = Query(format=operation_date_dict[\'format\'],\n
type=operation_date_dict[\'type\'],\n
**{\'delivery.start_date\':operation_date_dict[\'query\']})\n
- kw[\'source_section_where_expression\'] = ss_q()[\'where_expression\']\n
+ kw[\'source_section_where_expression\'] = ss_q(datetime_search_keys=[\'delivery.start_date\'])[\'where_expression\']\n
ds_q = Query(format=operation_date_dict[\'format\'],\n
type=operation_date_dict[\'type\'],\n
**{\'delivery.stop_date\':operation_date_dict[\'query\']})\n
- kw[\'destination_section_where_expression\'] = ds_q()[\'where_expression\']\n
+ kw[\'destination_section_where_expression\'] = ds_q(datetime_search_keys=[\'delivery.stop_date\'])[\'where_expression\']\n
del kw[\'operation_date\']\n
\n
return context.AccountingTransactionModule_zGetAccountingTransactionList( selection=None,\n
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml?rev=19112&r1=19111&r2=19112&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.xml Wed Feb 6 19:17:32 2008
@@ -96,11 +96,11 @@
ss_q = Query(format=operation_date_dict[\'format\'],\n
type=operation_date_dict[\'type\'],\n
**{\'delivery.start_date\':operation_date_dict[\'query\']})\n
- params[\'source_section_where_expression\'] = ss_q()[\'where_expression\']\n
+ params[\'source_section_where_expression\'] = ss_q(datetime_search_keys=[\'delivery.start_date\'])[\'where_expression\']\n
ds_q = Query(format=operation_date_dict[\'format\'],\n
type=operation_date_dict[\'type\'],\n
**{\'delivery.stop_date\':operation_date_dict[\'query\']})\n
- params[\'destination_section_where_expression\'] = ds_q()[\'where_expression\']\n
+ params[\'destination_section_where_expression\'] = ds_q(datetime_search_keys=[\'delivery.stop_date\'])[\'where_expression\']\n
del params[\'operation_date\']\n
\n
# this method can be used to build another complex query, for example\n
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.xml?rev=19112&r1=19111&r2=19112&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.xml (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.xml Wed Feb 6 19:17:32 2008
@@ -78,11 +78,11 @@
ss_q = Query(format=operation_date_dict[\'format\'],\n
type=operation_date_dict[\'type\'],\n
**{\'delivery.start_date\':operation_date_dict[\'query\']})\n
- params[\'source_section_where_expression\'] = ss_q()[\'where_expression\']\n
+ params[\'source_section_where_expression\'] = ss_q(datetime_search_keys=[\'delivery.start_date\'])[\'where_expression\']\n
ds_q = Query(format=operation_date_dict[\'format\'],\n
type=operation_date_dict[\'type\'],\n
**{\'delivery.stop_date\':operation_date_dict[\'query\']})\n
- params[\'destination_section_where_expression\'] = ds_q()[\'where_expression\']\n
+ params[\'destination_section_where_expression\'] = ds_q(datetime_search_keys=[\'delivery.stop_date\'])[\'where_expression\']\n
del params[\'operation_date\']\n
\n
result = context.AccountingTransactionModule_zGetAccountingTransactionList(\n
Added: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.xml?rev=19112&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.xml (added)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.xml Wed Feb 6 19:17:32 2008
@@ -1,0 +1,182 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>params = context.portal_selections.getSelectionParamsFor(selection_name)\n
+\n
+params[\'stat\'] = 1\n
+params[\'omit_output\'] = 1\n
+params[\'omit_input\'] = 0\n
+\n
+from Products.ZSQLCatalog.SQLCatalog import Query\n
+\n
+if params.get(\'operation_date\', {}).get(\'query\'):\n
+ operation_date_dict = params[\'operation_date\']\n
+ ss_q = Query(format=operation_date_dict[\'format\'],\n
+ type=operation_date_dict[\'type\'],\n
+ **{\'delivery.start_date\':operation_date_dict[\'query\']})\n
+ params[\'source_section_where_expression\'] = ss_q(datetime_search_keys=[\'delivery.start_date\'])[\'where_expression\']\n
+ ds_q = Query(format=operation_date_dict[\'format\'],\n
+ type=operation_date_dict[\'type\'],\n
+ **{\'delivery.stop_date\':operation_date_dict[\'query\']})\n
+ params[\'destination_section_where_expression\'] = ds_q(datetime_search_keys=[\'delivery.stop_date\'])[\'where_expression\']\n
+ del params[\'operation_date\']\n
+\n
+result = context.AccountingTransactionModule_zGetAccountingTransactionList(\n
+ selection=selection, selection_params = params, **params)\n
+row = result[0]\n
+return float(\'%.02f\' % (row.total_price or 0.0))\n
+# vim: syntax=python\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>selection=None, selection_name=None, **kw</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <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>_getattr_</string>
+ <string>context</string>
+ <string>params</string>
+ <string>_write_</string>
+ <string>Products.ZSQLCatalog.SQLCatalog</string>
+ <string>Query</string>
+ <string>_getitem_</string>
+ <string>operation_date_dict</string>
+ <string>_apply_</string>
+ <string>ss_q</string>
+ <string>ds_q</string>
+ <string>result</string>
+ <string>row</string>
+ <string>float</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <tuple>
+ <none/>
+ <none/>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>AccountingTransactionModule_statSourceDebit</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=19112&r1=19111&r2=19112&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision Wed Feb 6 19:17:32 2008
@@ -1,1 +1,1 @@
-590
+593
More information about the Erp5-report
mailing list