ERP5Workflow: remove storage id in properties from Interaction property sheet

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Interaction/portal_type_filter_property.xml

@@ -34,7 +34,9 @@
         </item>
         <item>
             <key> <string>storage_id</string> </key>
-            <value> <string>portal_type_filter</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
       </dictionary>
     </pickle>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Interaction/portal_type_group_filter_property.xml

@@ -34,7 +34,9 @@
         </item>
         <item>
             <key> <string>storage_id</string> </key>
-            <value> <string>portal_type_group_filter</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
       </dictionary>
     </pickle>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Interaction/temporary_document_disallowed_property.xml

@@ -30,7 +30,9 @@
         </item>
         <item>
             <key> <string>storage_id</string> </key>
-            <value> <string>temporary_document_disallowed</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
       </dictionary>
     </pickle>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Interaction/trigger_method_id_property.xml

@@ -34,7 +34,9 @@
         </item>
         <item>
             <key> <string>storage_id</string> </key>
-            <value> <string>method_id</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
       </dictionary>
     </pickle>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Interaction/trigger_once_per_transaction_property.xml

@@ -30,7 +30,9 @@
         </item>
         <item>
             <key> <string>storage_id</string> </key>
-            <value> <string>once_per_transaction</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
       </dictionary>
     </pickle>

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Interaction/trigger_type_property.xml

@@ -30,7 +30,9 @@
         </item>
         <item>
             <key> <string>storage_id</string> </key>
-            <value> <string>trigger_type</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
       </dictionary>
     </pickle>

product/ERP5Workflow/Document/Interaction.py

@@ -61,7 +61,7 @@ class Interaction(IdAsReferenceMixin('interaction_', "prefix"), XMLObject):
   trigger_type = TRIGGER_WORKFLOW_METHOD
   portal_type_filter = None
   portal_type_group_filter = None
-  once_per_transaction = False
+  trigger_once_per_transaction = False
   temporary_document_disallowed = False
   var_exprs = None  # A mapping.
   guard = None

product/ERP5Workflow/Document/InteractionWorkflow.py

@@ -407,8 +407,8 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
     interaction_list = self.objectValues(portal_type='Interaction')
     interaction_prop_id_to_show = sorted(['actbox_category', 'actbox_url', 'actbox_name',
     'activate_script_name', 'after_script_name', 'before_commit_script_name',
-    'description', 'groups', 'roles', 'expr', 'permissions', 'method_id',
-    'once_per_transaction', 'portal_type_filter', 'portal_type_group_filter',
+    'description', 'groups', 'roles', 'expr', 'permissions', 'trigger_method_id',
+    'trigger_once_per_transaction', 'portal_type_filter', 'portal_type_group_filter',
     'script_name', 'temporary_document_disallowed', 'trigger_type'])
     for tdef in interaction_list:
       interaction_reference_list.append(tdef.getReference())
@@ -436,14 +436,14 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
         elif property_id in ['actbox_name', 'actbox_url', 'actbox_category', 'trigger_type']:
           property_value = getattr(tdef, property_id, None)
           sub_object = SubElement(interaction, property_id, attrib=dict(type='string'))
-        elif property_id in ['activate_script_name', 'after_script_name', 'before_commit_script_name',
-              'method_id', 'once_per_transaction', 'portal_type_filter', 'portal_type_group_filter',
-              'script_name', 'temporary_document_disallowed']:
+        elif property_id in ['activate_script_name', 'after_script_name',
+              'before_commit_script_name', 'portal_type_filter',
+              'portal_type_group_filter', 'script_name',
+              'temporary_document_disallowed']:
           if property_id == 'activate_script_name': prop_id = 'activate_script_name_list'
           if property_id == 'after_script_name': prop_id = 'after_script_name_list'
           if property_id == 'before_commit_script_name': prop_id = 'before_commit_script_name_list'
-          if property_id == 'method_id': prop_id = 'trigger_method_id_list'
-          if property_id == 'once_per_transaction': prop_id = 'trigger_once_per_transaction'
+          if property_id == 'trigger_method_id': prop_id = 'trigger_method_id_list'
           if property_id == 'portal_type_filter': prop_id = 'portal_type_filter_list'
           if property_id == 'portal_type_group_filter': prop_id = 'portal_type_group_filter_list'
           if property_id == 'script_name': prop_id = 'before_script_name_list'