[Erp5-report] r20498 - in /erp5/trunk/bt5/erp5_project: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Apr 14 16:50:34 CEST 2008
Author: romain
Date: Mon Apr 14 16:50:33 2008
New Revision: 20498
URL: http://svn.erp5.org?rev=20498&view=rev
Log:
- In TaskLine_viewFieldLibrary's quantity_unit field might as well use
delegated Items, since they use preferences instead of hardcoded
method
- ProjectLine_viewFieldLibrary - likewise
- TaskLine_viewFieldLibrary patch 2 - width of Requirements field fixed
(acquired from Base_viewFieldLibrary proxyfield)
- TaskReportModule_exportTaskReportListAsiCalendar - wrong selection
name used
- Since TaskLine_viewFieldLibarary's quantity_unit field changed this
one has to be changed also: TaskReport_view's quantity_unit
Thanks to Mikolaj Antoszkiewicz.
Modified:
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml
erp5/trunk/bt5/erp5_project/bt/revision
Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml?rev=20498&r1=20497&r2=20498&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml Mon Apr 14 16:50:33 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ProxyField</string>
- <string>ProxyField</string>
- </tuple>
- <none/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -17,7 +14,6 @@
<value>
<list>
<string>title</string>
- <string>items</string>
</list>
</value>
</item>
@@ -68,12 +64,6 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>items</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
@@ -97,7 +87,7 @@
<value> <string>Click to edit the target</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value> <string>Unit</string> </value>
</item>
</dictionary>
@@ -106,23 +96,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>here/portal_categories/quantity_unit/getCategoryChildItemList</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml?rev=20498&r1=20497&r2=20498&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml Mon Apr 14 16:50:33 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ProxyField</string>
- <string>ProxyField</string>
- </tuple>
- <none/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -17,7 +14,6 @@
<value>
<list>
<string>title</string>
- <string>width</string>
<string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
@@ -71,12 +67,6 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>items</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
@@ -88,11 +78,11 @@
<value>
<dictionary>
<item>
- <key> <string>base_category</string> </key>
+ <key> <string>base_category</string> </key>
<value> <string>requirement</string> </value>
</item>
<item>
- <key> <string>catalog_index</string> </key>
+ <key> <string>catalog_index</string> </key>
<value> <string>title</string> </value>
</item>
<item>
@@ -108,7 +98,7 @@
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>portal_type</string> </key>
+ <key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
@@ -123,12 +113,8 @@
<value> <string>Click to edit the target</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value> <string>Requirements</string> </value>
- </item>
- <item>
- <key> <string>width</string> </key>
- <value> <int>80</int> </value>
</item>
</dictionary>
</value>
Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml?rev=20498&r1=20497&r2=20498&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml Mon Apr 14 16:50:33 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.ProxyField</string>
- <string>ProxyField</string>
- </tuple>
- <none/>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -17,7 +14,6 @@
<value>
<list>
<string>title</string>
- <string>items</string>
</list>
</value>
</item>
@@ -68,13 +64,11 @@
<value> <string></string> </value>
</item>
<item>
- <key> <string>items</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
</item>
<item>
- <key> <string>target</string> </key>
+ <key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -106,23 +100,4 @@
</dictionary>
</pickle>
</record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>here/portal_categories/quantity_unit/getCategoryChildTitleItemList</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml?rev=20498&r1=20497&r2=20498&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml Mon Apr 14 16:50:33 2008
@@ -127,7 +127,7 @@
print """BEGIN:VCALENDAR\n
PRODID:-//ERP5//NONSGML Task Report Module//EN \n
VERSION:2.0"""\n
-obj_list = context.getPortalObject().portal_selections.callSelectionFor("task_report_selection")\n
+obj_list = context.getPortalObject().portal_selections.callSelectionFor("task_report_module_selection")\n
for obj in obj_list : \n
print printTask(obj.getObject())\n
print "END:VCALENDAR"\n
Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml?rev=20498&r1=20497&r2=20498&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml Mon Apr 14 16:50:33 2008
@@ -13,6 +13,7 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>items</string>
<string>editable</string>
</list>
</value>
@@ -56,12 +57,22 @@
<value>
<dictionary>
<item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>target</string> </key>
@@ -87,6 +98,12 @@
<value> <string>TaskLine_viewFieldLibrary</string> </value>
</item>
<item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
@@ -96,4 +113,20 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'listbox_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=20498&r1=20497&r2=20498&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision Mon Apr 14 16:50:33 2008
@@ -1,1 +1,1 @@
-467
+468
More information about the Erp5-report
mailing list