diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doSelect.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doSelect.xml
index 461c03b0ca0714880102d3353f190bc97cca16a9..19616e4e6d7957e597ea92184a7d50a7da99dd4b 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doSelect.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_doSelect.xml
@@ -88,7 +88,7 @@ else:\n
if list_method_id:\n
try:\n
# Define form basic fields\n
- form = getattr(context,dialog_id)\n
+ form = getattr(context,form_id)\n
listbox_field = None\n
# Search listbox\n
for f in form.get_fields():\n
@@ -101,18 +101,18 @@ if list_method_id:\n
v = request.form.get(col_id, \'\')\n
kw[col_id] = v\n
# Redirect\n
- request.RESPONSE.redirect(\'%s/%s?%s\' % (context.absolute_url(), dialog_id, make_query(kw)))\n
+ request.RESPONSE.redirect(\'%s/%s?%s\' % (context.absolute_url(), form_id, make_query(kw)))\n
except ConflictError:\n
raise\n
except:\n
# Default behaviour is not as great but returns something\n
- return getattr(context,dialog_id)(request)\n
+ return getattr(context,form_id)(request)\n
else:\n
# Default behaviour is not as great but returns something\n
kw.update(request.form)\n
if kw.has_key(\'listbox_uid\'): del kw[\'listbox_uid\']\n
if kw.has_key(\'list_start\'): del kw[\'list_start\']\n
- request.RESPONSE.redirect(\'%s/%s?%s\' % (context.absolute_url(), dialog_id, make_query(kw)))\n
+ request.RESPONSE.redirect(\'%s/%s?%s\' % (context.absolute_url(), form_id, make_query(kw)))\n
</string> </value>
</item>
<item>
@@ -129,7 +129,7 @@ else:\n
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>dialog_id=\'\', selection_index=\'\', selection_name=\'\', list_method_id=None</string> </value>
+ <value> <string>form_id=\'\', selection_index=\'\', selection_name=\'\', list_method_id=None</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -155,7 +155,7 @@ else:\n
<key> <string>co_varnames</string> </key>
<value>
<tuple>
- <string>dialog_id</string>
+ <string>form_id</string>
<string>selection_index</string>
<string>selection_name</string>
<string>list_method_id</string>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_copy.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_copy.xml
index b979176f1da32ffc9cd5a23ee9c3630c4219fcc8..088d9023afd16db13021370a43c02d2a46ca4e5e 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_copy.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_copy.xml
@@ -83,7 +83,7 @@ if uids != []:\n
message = N_("Item(s)+Copied.")\n
else:\n
message = N_("Please+select+one+or+more+items+to+copy+first.")\n
-return request.RESPONSE.redirect(context.absolute_url() + \'/\' + dialog_id + \'?portal_status_message=%s\' % message)\n
+return request.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % message)\n
</string> </value>
</item>
<item>
@@ -100,7 +100,7 @@ return request.RESPONSE.redirect(context.absolute_url() + \'/\' + dialog_id + \'
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>dialog_id, uids=[], listbox_uid=[],selection_name=\'\'</string> </value>
+ <value> <string>form_id, uids=[], listbox_uid=[],selection_name=\'\'</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
@@ -132,7 +132,7 @@ return request.RESPONSE.redirect(context.absolute_url() + \'/\' + dialog_id + \'
<key> <string>co_varnames</string> </key>
<value>
<tuple>
- <string>dialog_id</string>
+ <string>form_id</string>
<string>uids</string>
<string>listbox_uid</string>
<string>selection_name</string>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_cut.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_cut.xml
index 2c54bf9ab6e0576ffa68c0520257fe756e7d5b4c..1b17c05966f6018c466961060815323a737c345a 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_cut.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_cut.xml
@@ -82,7 +82,7 @@ if uids != []:\n
message = N_("Item(s)+Cut.")\n
else:\n
message = N_("Please+select+one+or+more+items+to+cut+first.")\n
-return request.RESPONSE.redirect(context.absolute_url() + \'/\' + dialog_id + \'?portal_status_message=%s\' % message)\n
+return request.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % message)\n
</string> </value>
</item>
<item>
@@ -99,7 +99,7 @@ return request.RESPONSE.redirect(context.absolute_url() + \'/\' + dialog_id + \'
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>dialog_id,selection_name=\'\',uids=[],listbox_uid=[]</string> </value>
+ <value> <string>form_id,selection_name=\'\',uids=[],listbox_uid=[]</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -125,7 +125,7 @@ return request.RESPONSE.redirect(context.absolute_url() + \'/\' + dialog_id + \'
<key> <string>co_varnames</string> </key>
<value>
<tuple>
- <string>dialog_id</string>
+ <string>form_id</string>
<string>selection_name</string>
<string>uids</string>
<string>listbox_uid</string>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml
index e5687c561369d8c523650b6f3b3aa32ba5d480b3..0d05b0dd11387391d323fc8adec9859b43730afe 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_deleteObjectList.xml
@@ -78,7 +78,7 @@ uids = context.portal_selections.getSelectionCheckedUidsFor(selection_name)\n
if uids == []:\n
message = N_("Please+select+one+or+more+items+to+delete+first.")\n
qs = \'?portal_status_message=%s\' % message\n
- return request.RESPONSE.redirect( context.absolute_url() + \'/\' + dialog_id + qs )\n
+ return request.RESPONSE.redirect( context.absolute_url() + \'/\' + form_id + qs )\n
\n
kw = {\'uid\': uids}\n
request.set(\'object_uid\', context.getUid())\n
@@ -101,7 +101,7 @@ return context.Folder_viewDeleteDialog(uids=uids, REQUEST=request)\n
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>selection_index=None,dialog_id=\'\',uids=[], listbox_uid=[],selection_name=\'\'</string> </value>
+ <value> <string>selection_index=None,form_id=\'\',uids=[], listbox_uid=[],selection_name=\'\'</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -128,7 +128,7 @@ return context.Folder_viewDeleteDialog(uids=uids, REQUEST=request)\n
<value>
<tuple>
<string>selection_index</string>
- <string>dialog_id</string>
+ <string>form_id</string>
<string>uids</string>
<string>listbox_uid</string>
<string>selection_name</string>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_paste.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_paste.xml
index 70b0aac750d2595c173d41efa1a51b67a61fea36..7b1ef5c0c3f529a26bd971578a50012373c28ea1 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_paste.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_paste.xml
@@ -87,17 +87,17 @@ if context.cb_dataValid and error_message==\'\':\n
try:\n
new_item_list = context.manage_pasteObjects(REQUEST[\'__cp\'])\n
except KeyError:\n
- return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + dialog_id + \'?portal_status_message=Nothing+To+Paste.\')\n
+ return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=Nothing+To+Paste.\')\n
else:\n
new_id_list = [i[\'new_id\'] for i in new_item_list]\n
for my_id in new_id_list:\n
context[my_id].flushActivity(invoke=0, method_id=\'immediateReindexObject\')\n
context[my_id].recursiveImmediateReindexObject()\n
- return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + dialog_id + \'?portal_status_message=Item(s)+Pasted.\')\n
+ return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=Item(s)+Pasted.\')\n
elif context.cb_dataValid and error_message!=\'\':\n
- return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + dialog_id + \'?portal_status_message=%s\' % error_message)\n
+ return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=%s\' % error_message)\n
else:\n
- return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + dialog_id + \'?portal_status_message=Copy+or+cut+one+or+more+items+to+paste+first.\')\n
+ return REQUEST.RESPONSE.redirect(context.absolute_url() + \'/\' + form_id + \'?portal_status_message=Copy+or+cut+one+or+more+items+to+paste+first.\')\n
</string> </value>
</item>
<item>
@@ -114,7 +114,7 @@ else:\n
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>dialog_id</string> </value>
+ <value> <string>form_id</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -140,7 +140,7 @@ else:\n
<key> <string>co_varnames</string> </key>
<value>
<tuple>
- <string>dialog_id</string>
+ <string>form_id</string>
<string>_getattr_</string>
<string>context</string>
<string>REQUEST</string>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 3f10ffe7a4c473619c926cfb1e8d95e726e5a0ec..25bf17fc5aaabd17402e77a2b16f95fbea7310d2 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-15
\ No newline at end of file
+18
\ No newline at end of file