[Erp5-report] r30285 - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_skins/er...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Nov 4 12:00:13 CET 2009
Author: jerome
Date: Wed Nov 4 12:00:07 2009
New Revision: 30285
URL: http://svn.erp5.org?rev=30285&view=rev
Log:
supports searching and sorting by account reference
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountList.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountList/listbox.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountList.xml?rev=30285&r1=30284&r2=30285&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_getAccountList.xml [utf8] Wed Nov 4 12:00:07 2009
@@ -58,13 +58,26 @@
if params.get(\'precision\', None) is not None:\n
context.REQUEST.set(\'precision\', params[\'precision\'])\n
\n
+use_account_reference = \\\n
+ context.portal_preferences.getPreferredAccountNumberMethod() == \'account_reference\'\n
+\n
+if preferred_gap_id:\n
+ if use_account_reference:\n
+ kwd[\'reference\'] = preferred_gap_id\n
+ else:\n
+ kwd[\'preferred_gap_id\'] = preferred_gap_id\n
+\n
+\n
# XXX workaround for #458, we rewrite sort_on id to sort_on using\n
# strict_membership.\n
new_sort_on = []\n
if sort_on is not None:\n
for sort_on_item in sort_on:\n
if sort_on_item[0] == \'preferred_gap_id\':\n
- new_sort_on.append(\n
+ if use_account_reference:\n
+ new_sort_on.append((\'reference\', sort_on_item[1]))\n
+ else:\n
+ new_sort_on.append(\n
(\'preferred_gap_strict_membership_id\', sort_on_item[1]))\n
else:\n
new_sort_on.append(sort_on_item)\n
@@ -80,7 +93,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>sort_on=None, selection=None, selection_name=None, **kwd</string> </value>
+ <value> <string>preferred_gap_id=None, sort_on=None, selection=None, selection_name=None, **kwd</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -100,12 +113,13 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>3</int> </value>
+ <value> <int>4</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
+ <string>preferred_gap_id</string>
<string>sort_on</string>
<string>selection</string>
<string>selection_name</string>
@@ -115,6 +129,8 @@
<string>params</string>
<string>None</string>
<string>_getitem_</string>
+ <string>use_account_reference</string>
+ <string>_write_</string>
<string>new_sort_on</string>
<string>_getiter_</string>
<string>sort_on_item</string>
@@ -131,6 +147,7 @@
<key> <string>func_defaults</string> </key>
<value>
<tuple>
+ <none/>
<none/>
<none/>
<none/>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountList/listbox.xml?rev=30285&r1=30284&r2=30285&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountList/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewAccountList/listbox.xml [utf8] Wed Nov 4 12:00:07 2009
@@ -416,9 +416,7 @@
</item>
<item>
<key> <string>count_method</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
@@ -507,6 +505,10 @@
<value> <int>0</int> </value>
</item>
<item>
+ <key> <string>hide_rows_on_no_search_criterion</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
<key> <string>lines</string> </key>
<value> <int>15</int> </value>
</item>
@@ -517,7 +519,7 @@
<item>
<key> <string>list_method</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
@@ -565,6 +567,10 @@
<value> <int>1</int> </value>
</item>
<item>
+ <key> <string>row_css_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>search</string> </key>
<value> <int>1</int> </value>
</item>
@@ -657,7 +663,7 @@
<item>
<key> <string>stat_method</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
@@ -710,28 +716,12 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
- <value> <string>portal_catalog</string> </value>
+ <value> <string>AccountModule_getAccountList</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <global name="Method" module="Products.Formulator.MethodField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>method_name</string> </key>
- <value> <string>AccountModule_getAccountList</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<tuple>
<global name="Method" module="Products.Formulator.MethodField"/>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=30285&r1=30284&r2=30285&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Wed Nov 4 12:00:07 2009
@@ -1,1 +1,1 @@
-1030
+1031
More information about the Erp5-report
mailing list