[Erp5-report] r36110 jerome - in /erp5/trunk/bt5/erp5_accounting: SkinTemplateItem/portal_s...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jun 8 18:28:50 CEST 2010
Author: jerome
Date: Tue Jun 8 18:28:50 2010
New Revision: 36110
URL: http://svn.erp5.org?rev=36110&view=rev
Log:
use getPreferredAccountingTransactionLineFunctionBaseCategory in reports
Added:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getFunctionBaseCategoryTitle.xml
Modified:
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_function.xml
erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getFunctionItemList.xml
erp5/trunk/bt5/erp5_accounting/bt/revision
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_function.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_function.xml?rev=36110&r1=36109&r2=36110&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_function.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_function.xml [utf8] Tue Jun 8 18:28:50 2010
@@ -83,7 +83,9 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
</item>
</dictionary>
</value>
@@ -164,4 +166,20 @@
</dictionary>
</pickle>
</record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>context/AccountingTransactionLine_getFunctionBaseCategoryTitle</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Added: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getFunctionBaseCategoryTitle.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getFunctionBaseCategoryTitle.xml?rev=36110&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getFunctionBaseCategoryTitle.xml (added)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getFunctionBaseCategoryTitle.xml [utf8] Tue Jun 8 18:28:50 2010
@@ -1,0 +1,131 @@
+<?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>Script_magic</string> </key>
+ <value> <int>3</int> </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>portal = context.getPortalObject()\n
+\n
+function_base_category = portal.portal_preferences.getPreferredAccountingTransactionLineFunctionBaseCategory()\n
+\n
+if function_base_category:\n
+ return portal.portal_categories.restrictedTraverse(function_base_category).getBaseCategoryValue().getTitle()\n
+\n
+return \'Function\'\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></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>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>portal</string>
+ <string>function_base_category</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>AccountingTransactionLine_getFunctionBaseCategoryTitle</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getFunctionItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getFunctionItemList.xml?rev=36110&r1=36109&r2=36110&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getFunctionItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_getFunctionItemList.xml [utf8] Tue Jun 8 18:28:50 2010
@@ -55,18 +55,16 @@
<key> <string>_body</string> </key>
<value> <string>"""Returns the item list of possible functions to use on accounting lines.\n
"""\n
+portal = context.getPortalObject()\n
\n
-# Configure this ... maybe it will be a system preference\n
-function_base_category_id = None\n
-\n
-if function_base_category_id is not None:\n
- portal = context.getPortalObject()\n
- return getattr(portal.portal_categories[function_base_category_id], \n
+function_base_category = portal.portal_preferences.getPreferredAccountingTransactionLineFunctionBaseCategory()\n
+if function_base_category:\n
+ return getattr(portal.portal_categories.restrictedTraverse(function_base_category),\n
portal.portal_preferences.getPreference(\'preferred_category_child_item_list_method_id\',\n
\'getCategoryChildCompactLogicalPathItemList\'))(\n
local_sort_id=(\'int_index\', \'translated_title\'),\n
checked_permission=\'View\',\n
- base=1) \n
+ base=True) \n
\n
return ()\n
</string> </value>
@@ -105,13 +103,12 @@
<key> <string>co_varnames</string> </key>
<value>
<tuple>
- <string>None</string>
- <string>function_base_category_id</string>
<string>_getattr_</string>
<string>context</string>
<string>portal</string>
+ <string>function_base_category</string>
<string>getattr</string>
- <string>_getitem_</string>
+ <string>True</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_accounting/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_accounting/bt/revision?rev=36110&r1=36109&r2=36110&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_accounting/bt/revision [utf8] Tue Jun 8 18:28:50 2010
@@ -1,1 +1,1 @@
-1259
+1260
More information about the Erp5-report
mailing list