diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Base_checkOrCreateCheck.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Base_checkOrCreateCheck.xml
index 3b86145ec9817cf81d755d3b0c37caadb90e174b..1bae454dd2680e773141b12ba61cbd1ea47abde8 100644
--- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Base_checkOrCreateCheck.xml
+++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/Base_checkOrCreateCheck.xml
@@ -119,8 +119,7 @@ elif reference_range_min is not None or reference_range_max is not None:\n
 \n
 check_list = []\n
 bank_account_uid = bank_account.getUid()\n
-resource_value = None\n
-generic_model = None\n
+resource_value = portal.restrictedTraverse(resource)\n
 reference_dict = {}\n
 # First we must parse everyting to make sure there is no error,\n
 # this is safer because we catch Validation in workflow scripts\n
@@ -128,7 +127,7 @@ for check_reference in reference_list:\n
   message_tag = \'check_%s_%s_%s\' % (resource, bank_account_uid, check_reference)\n
   # just raise an error.\n
   if context.portal_activities.countMessageWithTag(message_tag) != 0:\n
-    msg = Message(domain=\'ui\', message="This check number is already being indexed.")\n
+    msg = Message(domain=\'ui\', message="There are operations pending that prevent to validate this document. Please try again later.")\n
     raise ValidationFailed, (msg,)\n
   result = context.portal_catalog(portal_type = \'Check\', reference = check_reference, \n
                                   destination_payment_uid = bank_account.getUid(),\n
@@ -136,11 +135,15 @@ for check_reference in reference_list:\n
   result_len = len(result)\n
   if result_len == 0:\n
     if not context.Base_isAutomaticCheckCreationAllowed():\n
-      msg = Message(domain = "ui", message="Sorry, this reference does not exist")\n
+      msg = Message(domain = "ui", message="Sorry, the $type $reference for the account $account does not exist",\n
+                                   mapping={\'reference\' : reference, \'account\': bank_account.getInternalBankAccountNumber(),\n
+                                            \'type\': resource_value.getTitle()})\n
       raise ValidationFailed, (msg,)\n
 \n
   elif result_len > 1:\n
-    msg = Message(domain=\'ui\', message=\'Duplicate checks for the same check number\')\n
+    msg = Message(domain = "ui", message="Sorry, the $type $reference for the account $account is duplicated",\n
+                                   mapping={\'reference\' : reference, \'account\': bank_account.getInternalAccountNumber(),\n
+                                            \'type\': resource_value.getTitle()})\n
     raise ValidationFailed, (msg,)\n
 \n
   reference_dict[check_reference] = {}\n
@@ -152,12 +155,12 @@ for check_reference in reference_list:\n
   result_len = reference_dict[check_reference][\'result_len\']\n
   result = reference_dict[check_reference][\'result\']\n
   message_tag = reference_dict[check_reference][\'message_tag\']\n
+  generic_model = None\n
   if result_len == 0:\n
     # This happens only if automatic creation is allowed. So create a new check at this point.\n
     # Get a checkbook for this bank account.\n
     checkbook = None\n
-    if resource_value is None:\n
-      resource_value = portal.restrictedTraverse(resource)\n
+    if generic_model is None:\n
       composition_related_list = resource_value.getCompositionRelatedValueList()\n
       if len(composition_related_list) == 0:\n
         msg = Message(domain = "ui", message="Sorry, no checkbook model found")\n
@@ -167,7 +170,7 @@ for check_reference in reference_list:\n
         raise ValidationFailed, (msg,)\n
       generic_model = composition_related_list[0]\n
 \n
-    generic_model = context.portal_catalog(portal_type = \'Checkbook Model\', title = \'Generic\')[0].getObject()\n
+    #generic_model = context.portal_catalog(portal_type = \'Checkbook Model\', title = \'Generic\')[0].getObject()\n
     # XXX it would be better to use a related key for this, but z_related_resource is too specific to\n
     # movement at the moment.\n
     for brain in context.portal_catalog(portal_type = \'Checkbook\',\n
@@ -184,7 +187,7 @@ for check_reference in reference_list:\n
       # This has a performance penalty, but this part of the script will rarely be called (once per bank account).\n
       checkbook_tag = "checkbook_%s_%s" % (resource, bank_account_uid) \n
       if context.portal_activities.countMessageWithTag(checkbook_tag) != 0:\n
-        msg = Message(domain=\'ui\', message="There is already a checkbook being indexed.")\n
+        msg = Message(domain=\'ui\', message="There are operations pending that prevent to validate this document. Please try again later.")\n
         raise ValidationFailed, (msg,)\n
       checkbook = context.checkbook_module.newContent(portal_type = \'Checkbook\',\n
                                                       title = \'Generic\',\n
@@ -277,7 +280,6 @@ return check_list\n
                             <string>check_list</string>
                             <string>bank_account_uid</string>
                             <string>resource_value</string>
-                            <string>generic_model</string>
                             <string>reference_dict</string>
                             <string>check_reference</string>
                             <string>message_tag</string>
@@ -286,6 +288,7 @@ return check_list\n
                             <string>result_len</string>
                             <string>_write_</string>
                             <string>_getitem_</string>
+                            <string>generic_model</string>
                             <string>checkbook</string>
                             <string>composition_related_list</string>
                             <string>brain</string>
diff --git a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_view/listbox_total_price.xml b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_view/listbox_total_price.xml
index 6ddd7a30ed20e5a2988a4aeaeff732b32d552acc..0cec83b4d7cb558235ec6e049623ca76a712dfeb 100644
--- a/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_view/listbox_total_price.xml
+++ b/bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckPayment_view/listbox_total_price.xml
@@ -259,18 +259,15 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: int(cell.getPrice())</string> </value>
+            <value> <string>python: int(here.getTotalPrice(fast=0))</string> </value>
         </item>
       </dictionary>
     </pickle>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml
index f46b1da98e3726303752eaa2eeff2d6119a852f1..1a9c603bb7d3ad3620d429e5239ef124ec675760 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/scripts/validateSourceAndDestination.xml
@@ -65,7 +65,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>transaction = state_change.object\n
+            <value> <string>transaction = state_change[\'object\']\n
 \n
 # Check getBaobabSource and getBaobabDestination\n
 transaction.Base_checkBaobabSourceAndDestination()\n
@@ -119,8 +119,9 @@ transaction.Base_checkBaobabSourceAndDestination()\n
                           <tuple>
                             <string>state_change</string>
                             <string>kw</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>transaction</string>
+                            <string>_getattr_</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/delivered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/delivered.xml
index 8269d1d86c66ece5d905ffe527bed581e6dac1d4..1947b72a3fa336bb889452a90d0ed7edbd1596e2 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/delivered.xml
@@ -60,17 +60,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -81,6 +78,7 @@
                         <string>Assignor</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -108,6 +106,7 @@
                         <string>Assignor</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/draft.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/draft.xml
index e9d310615c602e3e4d8645b388d5b31e12df235f..cdd9eb6823e158dfc7113a2a016dc224f9e87379 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/draft.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/draft.xml
@@ -86,6 +86,7 @@
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -119,6 +120,7 @@
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/ordered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/ordered.xml
index 541ef09c4fc67b3ba2c773d39a2f19592168721f..a0a73af9df0bae0170c76b71c2d40bc603fb056b 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/ordered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/ordered.xml
@@ -82,6 +82,7 @@
                         <string>Assignor</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -109,6 +110,7 @@
                         <string>Assignor</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/planned.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/planned.xml
index 8141ac3c9ff03f8ebea7bf278aaf30882fb12693..3af96c870814bca650920a0f574dc672d89765d3 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/planned.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/planned.xml
@@ -62,17 +62,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -83,6 +80,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -110,6 +108,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/waiting.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/waiting.xml
index 7c682540c45581249a76f1e49f94de25f9c823fc..f108af0f10acd5f4b6f783e79db47b42e5169449 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/waiting.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/states/waiting.xml
@@ -81,6 +81,7 @@
                         <string>Assignor</string>
                         <string>DestinationAssignee</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -103,6 +104,7 @@
                         <string>Assignor</string>
                         <string>DestinationAssignee</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateSourceAndDestination.xml
index f46b1da98e3726303752eaa2eeff2d6119a852f1..1a9c603bb7d3ad3620d429e5239ef124ec675760 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateSourceAndDestination.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/scripts/validateSourceAndDestination.xml
@@ -65,7 +65,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>transaction = state_change.object\n
+            <value> <string>transaction = state_change[\'object\']\n
 \n
 # Check getBaobabSource and getBaobabDestination\n
 transaction.Base_checkBaobabSourceAndDestination()\n
@@ -119,8 +119,9 @@ transaction.Base_checkBaobabSourceAndDestination()\n
                           <tuple>
                             <string>state_change</string>
                             <string>kw</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>transaction</string>
+                            <string>_getattr_</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/confirmed.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/confirmed.xml
index ff7370f319770a6293d56b2891f1a373abf984e3..34d26a3b1affd5b55cd0c1b75232d6888273f644 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/confirmed.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/confirmed.xml
@@ -64,17 +64,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -85,6 +82,7 @@
                         <string>Assignor</string>
                         <string>DestinationAssignee</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -101,7 +99,6 @@
                     <key> <string>Modify portal content</string> </key>
                     <value>
                       <tuple>
-                        <string>DestinationAssignee</string>
                         <string>Manager</string>
                       </tuple>
                     </value>
@@ -114,6 +111,7 @@
                         <string>Assignor</string>
                         <string>DestinationAssignee</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/delivered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/delivered.xml
index 53a6478fa67a8c71669479025c6ee9a4a6991332..e2cc316769d82574ce08b7313df1b877980fbbcd 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/delivered.xml
@@ -60,17 +60,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -81,6 +78,7 @@
                         <string>Assignor</string>
                         <string>DestinationAssignee</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -108,6 +106,7 @@
                         <string>Assignor</string>
                         <string>DestinationAssignee</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/draft.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/draft.xml
index fc916cfec49d4a824f8f983bd8f32967bf1d90bf..fce93774b8635581caeb1f76acb61573204101b2 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/draft.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/draft.xml
@@ -64,17 +64,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -85,6 +82,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -118,6 +116,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/ordered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/ordered.xml
index b6112ff5835748345d9f42aa5d039a6285432a98..77c5cd967b60164eb275661d76ebbbc24c0061ea 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/ordered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/ordered.xml
@@ -62,17 +62,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -82,6 +79,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -106,6 +104,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/planned.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/planned.xml
index dc08a9e929a01fb4cb338aa59820d8dc5605075c..166e90015453ca7e50d673155384fb55b426891e 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/planned.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/states/planned.xml
@@ -64,17 +64,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -85,6 +82,7 @@
                         <string>Assignor</string>
                         <string>DestinationAssignee</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -116,6 +114,7 @@
                         <string>Assignor</string>
                         <string>DestinationAssignee</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/states/delivered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/states/delivered.xml
index 7eca21092f0549dd0eed3355507d0a8104ffba87..d25fc107371a0a9fa82daa945ebbedad2003abfd 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/states/delivered.xml
@@ -60,17 +60,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -80,6 +77,7 @@
                         <string>Auditor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -98,6 +96,7 @@
                         <string>Auditor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/states/draft.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/states/draft.xml
index f6a1c4a35cec7d12236ef8e6f631c6af1e6b6c05..5dbc871e413efea4ca0a484dc5483b9117f32a8d 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/states/draft.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/states/draft.xml
@@ -64,17 +64,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -85,6 +82,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -107,6 +105,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/scripts/validateCheckbookVaultTransferConsistency.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/scripts/validateCheckbookVaultTransferConsistency.xml
index 2cdf06d04e7eafabaf777e3ddb7b9a0a4b2a41c0..2e80a059f8d03a654f821182efc5055a93d2a305 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/scripts/validateCheckbookVaultTransferConsistency.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/scripts/validateCheckbookVaultTransferConsistency.xml
@@ -68,7 +68,7 @@
             <value> <string>from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
 from Products.ERP5Type.Message import Message\n
 \n
-transaction = state_change.object\n
+transaction = state_change[\'object\']\n
 \n
 source = transaction.getSource()\n
 destination = transaction.getDestination()\n
@@ -134,8 +134,9 @@ transaction.CheckbookDelivery_checkAggregateStockList(at_date=at_date, node_url
                             <string>ValidationFailed</string>
                             <string>Products.ERP5Type.Message</string>
                             <string>Message</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>transaction</string>
+                            <string>_getattr_</string>
                             <string>source</string>
                             <string>destination</string>
                             <string>None</string>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/confirmed.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/confirmed.xml
index 1c63db5b952d821334b3295d06beb645c6931b42..2b75a496181c4755d5ee734cee358c81c11f4722 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/confirmed.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/confirmed.xml
@@ -56,17 +56,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -78,6 +75,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -106,6 +104,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/delivered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/delivered.xml
index c9f7a30a717d3295d9c8988b51320a4055353d7f..48cb0a4a30876629a962288f8dce864cd79339b5 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/delivered.xml
@@ -54,17 +54,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -76,6 +73,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -104,6 +102,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/draft.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/draft.xml
index 97a8ea17d120a0437a989e0ec2466c5f18e458e0..72df297c80348e6ceb3982d8d3b6e4f0cab8a45a 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/draft.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/draft.xml
@@ -58,17 +58,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -81,6 +78,7 @@
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -114,6 +112,7 @@
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/ordered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/ordered.xml
index 3eab71d1548ddbf7adbfecf5501dab837703af3d..7a2309091bd7c73c33fbcf3d3ef8fe006e0b9632 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/ordered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/ordered.xml
@@ -57,17 +57,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -79,6 +76,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -107,6 +105,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/planned.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/planned.xml
index 6774e76bc47c413391dfa7b1d8b63558f0743d16..da4bb4e4309038cb22d36e54912919f607109cc5 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/planned.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_movement_workflow/states/planned.xml
@@ -56,17 +56,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -78,6 +75,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -106,6 +104,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml
index c3ff5fc1e920044c1354016a727f026dc52959c9..35b7ce02445cd009ae6fc6cd6db8cc1751f7e83b 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_generateItemList.xml
@@ -68,7 +68,7 @@
             <value> <string encoding="cdata"><![CDATA[
 
 from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
-transaction = state_change.object\n
+transaction = state_change[\'object\']\n
 \n
 # Check getBaobabSource and getBaobabDestination\n
 transaction.Base_checkBaobabSourceAndDestination()\n
@@ -303,8 +303,9 @@ for line in line_list:\n
                             <string>state_change</string>
                             <string>Products.DCWorkflow.DCWorkflow</string>
                             <string>ValidationFailed</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>transaction</string>
+                            <string>_getattr_</string>
                             <string>portal</string>
                             <string>portal_activities</string>
                             <string>line_list</string>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_validateData.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_validateData.xml
index c32f223d6c61fc679b516ca6637f918c00ad1ed4..d46d597bf85f0c8a73b23707f5f7cea882091823 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_validateData.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/CheckbookReception_validateData.xml
@@ -68,7 +68,7 @@
             <value> <string>from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
 from Products.ERP5Type.Message import Message\n
 \n
-object = state_change.object\n
+object = state_change[\'object\']\n
 \n
 # Check that the destination is not empty\n
 destination = object.getDestination()\n
@@ -134,8 +134,9 @@ if len(object.objectValues())==0:\n
                             <string>ValidationFailed</string>
                             <string>Products.ERP5Type.Message</string>
                             <string>Message</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>object</string>
+                            <string>_getattr_</string>
                             <string>destination</string>
                             <string>None</string>
                             <string>message</string>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/validateSourceAndDestination.xml
index f46b1da98e3726303752eaa2eeff2d6119a852f1..1a9c603bb7d3ad3620d429e5239ef124ec675760 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/validateSourceAndDestination.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/scripts/validateSourceAndDestination.xml
@@ -65,7 +65,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>transaction = state_change.object\n
+            <value> <string>transaction = state_change[\'object\']\n
 \n
 # Check getBaobabSource and getBaobabDestination\n
 transaction.Base_checkBaobabSourceAndDestination()\n
@@ -119,8 +119,9 @@ transaction.Base_checkBaobabSourceAndDestination()\n
                           <tuple>
                             <string>state_change</string>
                             <string>kw</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>transaction</string>
+                            <string>_getattr_</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/states/confirmed.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/states/confirmed.xml
index b23b74ecbb6210ad01961d0a8a4a83c70a2d8c71..8789b7078852abd16260ce01c9bd2b45a008347f 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/states/confirmed.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/states/confirmed.xml
@@ -62,17 +62,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -82,6 +79,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -108,6 +106,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/states/delivered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/states/delivered.xml
index a6790feaf789f0fc7c71c03e96331e3d450b9e78..bb9b0e627c13e8ad392a3fb7a6e02cce66aaf6a4 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/states/delivered.xml
@@ -60,17 +60,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -80,6 +77,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -106,6 +104,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/states/draft.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/states/draft.xml
index 3becfc357da32a15ae134388783b4bdd7fe15844..bdbef94717072639f85b0533170226d1645b2b94 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/states/draft.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/states/draft.xml
@@ -64,17 +64,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -85,6 +82,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -118,6 +116,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateCheckbookVaultTransferConsistency.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateCheckbookVaultTransferConsistency.xml
index 44fba67b25f8620cf1c58c020e2176f1be859a14..2e92ff7ed8cb6c0930385277303c6921395f4d2e 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateCheckbookVaultTransferConsistency.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateCheckbookVaultTransferConsistency.xml
@@ -68,7 +68,7 @@
             <value> <string>from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
 from Products.ERP5Type.Message import Message\n
 \n
-transaction = state_change.object\n
+transaction = state_change[\'object\']\n
 \n
 \n
 source = transaction.getBaobabSource()\n
@@ -134,8 +134,9 @@ if msg is not None:\n
                             <string>ValidationFailed</string>
                             <string>Products.ERP5Type.Message</string>
                             <string>Message</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>transaction</string>
+                            <string>_getattr_</string>
                             <string>source</string>
                             <string>destination</string>
                             <string>None</string>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateSourceAndDestination.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateSourceAndDestination.xml
index f46b1da98e3726303752eaa2eeff2d6119a852f1..1a9c603bb7d3ad3620d429e5239ef124ec675760 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateSourceAndDestination.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/scripts/validateSourceAndDestination.xml
@@ -65,7 +65,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>transaction = state_change.object\n
+            <value> <string>transaction = state_change[\'object\']\n
 \n
 # Check getBaobabSource and getBaobabDestination\n
 transaction.Base_checkBaobabSourceAndDestination()\n
@@ -119,8 +119,9 @@ transaction.Base_checkBaobabSourceAndDestination()\n
                           <tuple>
                             <string>state_change</string>
                             <string>kw</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>transaction</string>
+                            <string>_getattr_</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/states/confirmed.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/states/confirmed.xml
index 819d26f21a10ce3123e35359f20ae85a2c856723..c48e3750091cc2a0f57ac28664f976fc8e484939 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/states/confirmed.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/states/confirmed.xml
@@ -56,17 +56,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -78,6 +75,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -106,6 +104,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/states/delivered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/states/delivered.xml
index 5626d17c8bbef802475680a88ae17c1e32ed0e9b..c39020c8d273d061bff786f070d2301832e14669 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/states/delivered.xml
@@ -54,17 +54,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -76,6 +73,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -104,6 +102,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/states/draft.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/states/draft.xml
index c692986b7bf08538d039c3c8c16ba06bdd5650ec..742197cb625391271144ca6f3b495a16936876b2 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/states/draft.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/states/draft.xml
@@ -58,17 +58,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -81,6 +78,7 @@
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -114,6 +112,7 @@
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/scripts/validateCheckbookVaultTransferConsistency.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/scripts/validateCheckbookVaultTransferConsistency.xml
index b34527b2f6f30d232d106edbb74a3c43b1ab25f5..7919c2849a47d7cc85e697c5b08211587c32b948 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/scripts/validateCheckbookVaultTransferConsistency.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/scripts/validateCheckbookVaultTransferConsistency.xml
@@ -68,7 +68,7 @@
             <value> <string>from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
 from Products.ERP5Type.Message import Message\n
 \n
-transaction = state_change.object\n
+transaction = state_change[\'object\']\n
 \n
 source = transaction.getBaobabSource()\n
 destination = transaction.getBaobabDestination()\n
@@ -132,8 +132,9 @@ if msg is not None:\n
                             <string>ValidationFailed</string>
                             <string>Products.ERP5Type.Message</string>
                             <string>Message</string>
-                            <string>_getattr_</string>
+                            <string>_getitem_</string>
                             <string>transaction</string>
+                            <string>_getattr_</string>
                             <string>source</string>
                             <string>destination</string>
                             <string>None</string>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/confirmed.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/confirmed.xml
index af3a90902de43a753a7fb43409b274ca7f4a4710..26ba10887a7cb7bf9eb0c08f3b08613ad67b98f1 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/confirmed.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/confirmed.xml
@@ -56,17 +56,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -78,6 +75,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -106,6 +104,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/delivered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/delivered.xml
index c9f7a30a717d3295d9c8988b51320a4055353d7f..48cb0a4a30876629a962288f8dce864cd79339b5 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/delivered.xml
@@ -54,17 +54,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -76,6 +73,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -104,6 +102,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/draft.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/draft.xml
index 97a8ea17d120a0437a989e0ec2466c5f18e458e0..72df297c80348e6ceb3982d8d3b6e4f0cab8a45a 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/draft.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/draft.xml
@@ -58,17 +58,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -81,6 +78,7 @@
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -114,6 +112,7 @@
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/ordered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/ordered.xml
index dee3b884adde31bc1440f6e23016d1d7aadaa8fe..27aedecd78e98e50f183543700d6a513fc1f0787 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/ordered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/ordered.xml
@@ -58,17 +58,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -80,6 +77,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -108,6 +106,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/planned.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/planned.xml
index 65f0860ad5093d4f8a6c6a2cb3d857255cf2dc13..ee959ee4b78c193f937f79368a7f6b22f8b4578a 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/planned.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/states/planned.xml
@@ -56,17 +56,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -78,6 +75,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -106,6 +104,7 @@
                         <string>DestinationAssignee</string>
                         <string>DestinationAssignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/confirmed.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/confirmed.xml
index c2d89fbbaa23d5fcdf55ffb5803efc790f2aec7f..543c30a0352bab8a37f57d373816caaba06618b3 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/confirmed.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/confirmed.xml
@@ -56,17 +56,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -76,6 +73,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -95,6 +93,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/delivered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/delivered.xml
index 85ece5de34d67c140351fe0798a2eddc8aa1e54f..b1053c9b7d4a8a9aad55d88b107a0ca4fc7c4001 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/delivered.xml
@@ -51,17 +51,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -72,6 +69,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -91,6 +89,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/draft.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/draft.xml
index 57cb261eecb7a08c41a9b0dd5694bba29e353a14..c67d2f86f95a4814a6fe12c3e262bdd7c796aa81 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/draft.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/draft.xml
@@ -58,17 +58,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -79,6 +76,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -101,6 +99,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/started.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/started.xml
index a2c3c7882fdee5052451529ecb05adedb6cd55dc..abb2752f0400368eec6d34becde4d3b9515f98a5 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/started.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/started.xml
@@ -55,17 +55,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -75,6 +72,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -94,6 +92,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/stopped.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/stopped.xml
index 18b90601607b6235b5b7c2dbd8a789ae57050a50..1f4011481d09cfcb73f4bb8992dbb852d87efa18 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/stopped.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/states/stopped.xml
@@ -55,17 +55,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -75,6 +72,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -94,6 +92,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Manager</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/states/delivered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/states/delivered.xml
index 24b15a74166d4aef11f3d1acca4ede84ad4cb787..10f31c593c4db23f5becdcc60eeaf77d6cbfc5a9 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/states/delivered.xml
@@ -54,17 +54,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -74,6 +71,7 @@
                         <string>Auditor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -92,6 +90,7 @@
                         <string>Auditor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/states/draft.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/states/draft.xml
index b4ddd1c3b9d0c6f2068b479dcef66217f9c969b5..001d6a2b335e9e6eca6920c1f09f45c93d8b4ae5 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/states/draft.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/states/draft.xml
@@ -58,17 +58,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -79,6 +76,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -101,6 +99,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/states/delivered.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/states/delivered.xml
index 24b15a74166d4aef11f3d1acca4ede84ad4cb787..10f31c593c4db23f5becdcc60eeaf77d6cbfc5a9 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/states/delivered.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/states/delivered.xml
@@ -54,17 +54,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -74,6 +71,7 @@
                         <string>Auditor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -92,6 +90,7 @@
                         <string>Auditor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/states/draft.xml b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/states/draft.xml
index b4ddd1c3b9d0c6f2068b479dcef66217f9c969b5..001d6a2b335e9e6eca6920c1f09f45c93d8b4ae5 100644
--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/states/draft.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/states/draft.xml
@@ -58,17 +58,14 @@
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Persistence</string>
-          <string>PersistentMapping</string>
-        </tuple>
-        <none/>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_container</string> </key>
+            <key> <string>data</string> </key>
             <value>
               <dictionary>
                 <item>
@@ -79,6 +76,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
@@ -101,6 +99,7 @@
                         <string>Assignor</string>
                         <string>Manager</string>
                         <string>Owner</string>
+                        <string>Reviewer</string>
                       </tuple>
                     </value>
                 </item>
diff --git a/bt5/erp5_banking_check/bt/revision b/bt5/erp5_banking_check/bt/revision
index 74de09f2e7a2e3294cc1b3e921bdaf69dc41973c..8bc94cb760413754f1d334f731fb0318bd2cc365 100644
--- a/bt5/erp5_banking_check/bt/revision
+++ b/bt5/erp5_banking_check/bt/revision
@@ -1 +1 @@
-274
\ No newline at end of file
+276
\ No newline at end of file