Skip to content

erp5
erp5
Commit e04d31df authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

- 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.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20498 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9c8beb74
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 84 deletions
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_quantity_unit.xml
View file @ e04d31df
......@@ -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>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/ProjectLine_viewFieldLibrary/my_requirement_logical_path_list.xml
View file @ e04d31df
......@@ -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>
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskLine_viewFieldLibrary/my_quantity_unit.xml
View file @ e04d31df
......@@ -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>
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_exportTaskReportListAsiCalendar.xml
View file @ e04d31df
......@@ -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
......
bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReport_view/listbox_quantity_unit.xml
View file @ e04d31df
......@@ -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>
bt5/erp5_project/bt/revision
View file @ e04d31df
467
\ No newline at end of file
468
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7