diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml index 3408b8543b9c78d5a5f777f9a77084cc90036e46..c0a9da048035b2a1af317298f14d322cffb19329 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml @@ -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> @@ -67,12 +63,6 @@ <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> <value> <string></string> </value> @@ -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> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml index df61bce20ac748ad0888676858f39f1bc08ed144..d3c9c7cb7133a8e2d7f711a4fd6c7ceaf9cc704b 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml @@ -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> @@ -70,12 +66,6 @@ <key> <string>form_id</string> </key> <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> @@ -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,13 +113,9 @@ <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> </item> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml index cb04a16b84cb1d1aa9266a34176e67d2059c6f66..3e431234733df9f3c43e46f2f853bfee58faf1f9 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml @@ -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> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml index 85a714e29d82a41350e0baf7e7dab87f3006b5ee..d3ddad7ad3d97409cca5dbf7511c4aa23de72339 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml @@ -127,7 +127,7 @@ PRIORITY:%(priority)s""" % ( {\n 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 diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml index ad3efd66eeef219b47cfa87c6c66548949b0afb5..705199ec791525eeb7df4abd4221278ae8692abe 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml @@ -13,6 +13,7 @@ <key> <string>delegated_list</string> </key> <value> <list> + <string>items</string> <string>editable</string> </list> </value> @@ -55,6 +56,10 @@ <key> <string>tales</string> </key> <value> <dictionary> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> <item> <key> <string>field_id</string> </key> <value> <string></string> </value> @@ -63,6 +68,12 @@ <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> <value> <string></string> </value> @@ -86,6 +97,12 @@ <key> <string>form_id</string> </key> <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> @@ -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> diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index 02416eb97cd292181088235cae7363a1d11cef60..4c9bbbfa9a93b5af4b918216fc2661929e335751 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -467 \ No newline at end of file +468 \ No newline at end of file