use getIdOrUserName() in workflow actor.

so that getId() is used for ERP5 users and getUserName() is used for special users like Anonyous User or System Processes whose id is None.

use getIdOrUserName() in workflow actor.
so that getId() is used for ERP5 users and getUserName() is used for special users like Anonyous User or System Processes whose id is None.
71737403 · Kazuhiko Shiozaki · Vincent Pelletier · 1fc4fc1b · 71737403 · 71737403
Commit 71737403 authored Oct 26, 2016 by Kazuhiko Shiozaki Committed by Vincent Pelletier Dec 23, 2016
152 changed files
--- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/account_workflow/variables/actor.xml
+++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/account_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_period_workflow/variables/actor.xml
+++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_period_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/variables/actor.xml
+++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/internal_invoice_transaction_simulation_workflow/variables/actor.xml
+++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/internal_invoice_transaction_simulation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/variables/actor.xml
+++ b/bt5/erp5_advanced_invoicing/WorkflowTemplateItem/portal_workflow/invoice_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_cloth_workflow/variables/actor.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_cloth_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_component_workflow/variables/actor.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_component_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/variables/actor.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_model_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_shape_workflow/variables/actor.xml
+++ b/bt5/erp5_apparel/WorkflowTemplateItem/portal_workflow/apparel_shape_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_inventory_workflow/variables/actor.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_inventory_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/actor.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_bank_reconciliation/WorkflowTemplateItem/portal_workflow/bank_reconciliation_validation_workflow/variables/actor.xml
+++ b/bt5/erp5_bank_reconciliation/WorkflowTemplateItem/portal_workflow/bank_reconciliation_validation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_balance_regulation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_exchange_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_new_not_emitted_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_new_not_emitted_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_movement_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_statistic_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_statistic_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_sorting_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_purchase_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_purchase_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_sale_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/cash_to_currency_sale_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/classification_survey_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/counter_rendering_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/destruction_survey_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/destruction_survey_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/foreign_cash_reception_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/historical_operation_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/historical_operation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_deposit_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_payment_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/internal_money_payment_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_destruction_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_issue_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_recall_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_reception_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/monetary_survey_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_rendering_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/money_deposit_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/mutilated_banknote_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_rendering_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/usual_cash_transfer_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_cash/WorkflowTemplateItem/portal_workflow/vault_transfer_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_deposit_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/check_payment_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_delivery_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_reception_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_usual_cash_transfer_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/checkbook_vault_transfer_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName   </string> </value>
+            <value> <string>user/getIdOrUserName   </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/stop_payment_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_purchase_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_check/WorkflowTemplateItem/portal_workflow/traveler_check_sale_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_cancellation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/accounting_date_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/bank_account_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/bank_account_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/check_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/checkbook_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/counter_date_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/currency_exchange_line_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_core/WorkflowTemplateItem/portal_workflow/currency_exchange_line_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/actor.xml
+++ b/bt5/erp5_banking_inventory/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/assignment_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/career_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/delivery_causality_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/embedded_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/embedded_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/processing_status_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/query_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_process_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/solver_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/user_account_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/actor.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_transaction_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/actor.xml
+++ b/bt5/erp5_budget/WorkflowTemplateItem/portal_workflow/budget_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/group_calendar_workflow/variables/actor.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/group_calendar_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/actor.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/leave_request_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/actor.xml
+++ b/bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/presence_request_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/variables/actor.xml
+++ b/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_configurator/WorkflowTemplateItem/portal_workflow/business_configuration_simulation_workflow/variables/actor.xml
+++ b/bt5/erp5_configurator/WorkflowTemplateItem/portal_workflow/business_configuration_simulation_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_configurator_ebusiness_lotse/PathTemplateItem/workflow_module/ebusiness_lotse_configuration_workflow/42.xml
+++ b/bt5/erp5_configurator_ebusiness_lotse/PathTemplateItem/workflow_module/ebusiness_lotse_configuration_workflow/42.xml
@@ -40,7 +40,7 @@
        </item>
        <item>
            <key> <string>initial_value</string> </key>
-            <value> <string>python: member.getUserName()</string> </value>
+            <value> <string>python: member.getId()</string> </value>
        </item>
        <item>
            <key> <string>portal_type</string> </key>

--- a/bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/42.xml
+++ b/bt5/erp5_configurator_maxma_demo/PathTemplateItem/workflow_module/maxma_demo_configuration_workflow/42.xml
@@ -40,7 +40,7 @@
        </item>
        <item>
            <key> <string>initial_value</string> </key>
-            <value> <string>python: member.getUserName()</string> </value>
+            <value> <string>python: member.getId()</string> </value>
        </item>
        <item>
            <key> <string>portal_type</string> </key>

--- a/bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/42.xml
+++ b/bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/42.xml
@@ -40,7 +40,7 @@
        </item>
        <item>
            <key> <string>initial_value</string> </key>
-            <value> <string>python: member.getUserName()</string> </value>
+            <value> <string>python: member.getId()</string> </value>
        </item>
        <item>
            <key> <string>portal_type</string> </key>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/42.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/42.xml
@@ -40,7 +40,7 @@
        </item>
        <item>
            <key> <string>initial_value</string> </key>
-            <value> <string>python: member.getUserName()</string> </value>
+            <value> <string>python: member.getId()</string> </value>
        </item>
        <item>
            <key> <string>portal_type</string> </key>

--- a/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/42.xml
+++ b/bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/42.xml
@@ -40,7 +40,7 @@
        </item>
        <item>
            <key> <string>initial_value</string> </key>
-            <value> <string>python: member.getUserName()</string> </value>
+            <value> <string>python: member.getId()</string> </value>
        </item>
        <item>
            <key> <string>portal_type</string> </key>

--- a/bt5/erp5_configurator_ung/PathTemplateItem/workflow_module/ung_configuration_workflow/42.xml
+++ b/bt5/erp5_configurator_ung/PathTemplateItem/workflow_module/ung_configuration_workflow/42.xml
@@ -40,7 +40,7 @@
        </item>
        <item>
            <key> <string>initial_value</string> </key>
-            <value> <string>python: member.getUserName()</string> </value>
+            <value> <string>python: member.getId()</string> </value>
        </item>
        <item>
            <key> <string>portal_type</string> </key>

--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/actor.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_step_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/actor.xml
+++ b/bt5/erp5_consulting/WorkflowTemplateItem/portal_workflow/test_report_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_content_translation/WorkflowTemplateItem/portal_workflow/content_translation_workflow/variables/actor.xml
+++ b/bt5/erp5_content_translation/WorkflowTemplateItem/portal_workflow/content_translation_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_credential/WorkflowTemplateItem/portal_workflow/credential_validation_workflow/variables/actor.xml
+++ b/bt5/erp5_credential/WorkflowTemplateItem/portal_workflow/credential_validation_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/acknowledgement_workflow/variables/actor.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/acknowledgement_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_simulation_workflow/variables/actor.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_simulation_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/actor.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/event_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/variables/actor.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/variables/actor.xml
@@ -55,7 +55,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName  </string> </value>
+            <value> <string>user/getIdOrUserName  </string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/actor.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_data_protection/WorkflowTemplateItem/portal_workflow/data_protection_request_workflow/variables/actor.xml
+++ b/bt5/erp5_data_protection/WorkflowTemplateItem/portal_workflow/data_protection_request_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_direct_debit_payment/WorkflowTemplateItem/portal_workflow/direct_debit_mandate_validation_workflow/variables/actor.xml
+++ b/bt5/erp5_direct_debit_payment/WorkflowTemplateItem/portal_workflow/direct_debit_mandate_validation_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_ingestion_workflow/variables/actor.xml
+++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_ingestion_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/variables/actor.xml
+++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_publication_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_staging_workflow/variables/actor.xml
+++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/document_staging_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/external_document_publication_workflow/variables/actor.xml
+++ b/bt5/erp5_dms/WorkflowTemplateItem/portal_workflow/external_document_publication_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_anonymous_workflow/variables/actor.xml
+++ b/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_anonymous_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_universal_workflow/variables/actor.xml
+++ b/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_universal_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_email_reader/WorkflowTemplateItem/portal_workflow/email_thread_workflow/variables/actor.xml
+++ b/bt5/erp5_email_reader/WorkflowTemplateItem/portal_workflow/email_thread_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_external_account/WorkflowTemplateItem/portal_workflow/external_account_validation_workflow/variables/actor.xml
+++ b/bt5/erp5_external_account/WorkflowTemplateItem/portal_workflow/external_account_validation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/actor.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_event_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/actor.xml
+++ b/bt5/erp5_forge/WorkflowTemplateItem/portal_workflow/bug_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_forum_tutorial/WorkflowTemplateItem/portal_workflow/discussion_thread_workflow/variables/actor.xml
+++ b/bt5/erp5_forum_tutorial/WorkflowTemplateItem/portal_workflow/discussion_thread_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_free_subscription/WorkflowTemplateItem/portal_workflow/free_subscription_request_validation_workflow/variables/actor.xml
+++ b/bt5/erp5_free_subscription/WorkflowTemplateItem/portal_workflow/free_subscription_request_validation_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_hr/WorkflowTemplateItem/portal_workflow/position_workflow/variables/actor.xml
+++ b/bt5/erp5_hr/WorkflowTemplateItem/portal_workflow/position_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/actor.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/amortisation_transaction_causality_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/actor.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_delivery_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/actor.xml
+++ b/bt5/erp5_immobilisation/WorkflowTemplateItem/portal_workflow/immobilisation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/implicit_item_movement_workflow/variables/actor.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/implicit_item_movement_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/actor.xml
+++ b/bt5/erp5_item/WorkflowTemplateItem/portal_workflow/item_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/actor.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_order_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/actor.xml
+++ b/bt5/erp5_mrp/WorkflowTemplateItem/portal_workflow/production_packing_list_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/actor.xml
+++ b/bt5/erp5_open_trade/WorkflowTemplateItem/portal_workflow/open_order_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_payline/WorkflowTemplateItem/portal_workflow/payline_transaction_workflow/variables/actor.xml
+++ b/bt5/erp5_payline/WorkflowTemplateItem/portal_workflow/payline_transaction_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_payment_mean/WorkflowTemplateItem/portal_workflow/payment_transaction_group_validation_workflow/variables/actor.xml
+++ b/bt5/erp5_payment_mean/WorkflowTemplateItem/portal_workflow/payment_transaction_group_validation_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_payroll_l10n_fr/WorkflowTemplateItem/portal_workflow/dsn_social_declaration_report_workflow/variables/actor.xml
+++ b/bt5/erp5_payroll_l10n_fr/WorkflowTemplateItem/portal_workflow/dsn_social_declaration_report_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/actor.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/project_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/actor.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/requirement_analysis_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/actor.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_report_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/actor.xml
+++ b/bt5/erp5_project/WorkflowTemplateItem/portal_workflow/task_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_publication/WorkflowTemplateItem/portal_workflow/decision_workflow/variables/actor.xml
+++ b/bt5/erp5_publication/WorkflowTemplateItem/portal_workflow/decision_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/egov_form_validation_workflow/variables/actor.xml
+++ b/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/egov_form_validation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/event_workflow/variables/actor.xml
+++ b/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/event_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/headquarters_status_workflow/variables/actor.xml
+++ b/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/headquarters_status_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/ohada_assignment_workflow/variables/actor.xml
+++ b/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/ohada_assignment_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/ohada_business_life_cycle_workflow/variables/actor.xml
+++ b/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/ohada_business_life_cycle_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/psj_validation_workflow/variables/actor.xml
+++ b/bt5/erp5_registry_ohada/WorkflowTemplateItem/portal_workflow/psj_validation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_run_my_doc/WorkflowTemplateItem/portal_workflow/review_workflow/variables/actor.xml
+++ b/bt5/erp5_run_my_doc/WorkflowTemplateItem/portal_workflow/review_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_syncml/WorkflowTemplateItem/portal_workflow/syncml_signature_validation_workflow/variables/actor.xml
+++ b/bt5/erp5_syncml/WorkflowTemplateItem/portal_workflow/syncml_signature_validation_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_syncml/WorkflowTemplateItem/portal_workflow/syncml_subcription_validation_workflow/variables/actor.xml
+++ b/bt5/erp5_syncml/WorkflowTemplateItem/portal_workflow/syncml_subcription_validation_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_syncml/WorkflowTemplateItem/portal_workflow/syncml_subscription_authentication_workflow/variables/actor.xml
+++ b/bt5/erp5_syncml/WorkflowTemplateItem/portal_workflow/syncml_subscription_authentication_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_syncml/WorkflowTemplateItem/portal_workflow/syncml_synchronization_workflow/variables/actor.xml
+++ b/bt5/erp5_syncml/WorkflowTemplateItem/portal_workflow/syncml_synchronization_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_system_event/WorkflowTemplateItem/portal_workflow/system_event_workflow/variables/actor.xml
+++ b/bt5/erp5_system_event/WorkflowTemplateItem/portal_workflow/system_event_workflow/variables/actor.xml
@@ -53,7 +53,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_tax_return/WorkflowTemplateItem/portal_workflow/tax_return_workflow/variables/actor.xml
+++ b/bt5/erp5_tax_return/WorkflowTemplateItem/portal_workflow/tax_return_workflow/variables/actor.xml
@@ -56,7 +56,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_test_result/WorkflowTemplateItem/portal_workflow/test_node_workflow/variables/actor.xml
+++ b/bt5/erp5_test_result/WorkflowTemplateItem/portal_workflow/test_node_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_test_result/WorkflowTemplateItem/portal_workflow/test_result_workflow/variables/actor.xml
+++ b/bt5/erp5_test_result/WorkflowTemplateItem/portal_workflow/test_result_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_test_result/WorkflowTemplateItem/portal_workflow/test_suite_workflow/variables/actor.xml
+++ b/bt5/erp5_test_result/WorkflowTemplateItem/portal_workflow/test_suite_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/actor.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/actor.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/inventory_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/actor.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/actor.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_container_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/actor.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/variables/actor.xml
+++ b/bt5/erp5_travel_expense/WorkflowTemplateItem/portal_workflow/ticket_acceptance_simulation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/actor.xml
+++ b/bt5/erp5_ui_test/WorkflowTemplateItem/portal_workflow/foo_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/category_publication_workflow/variables/actor.xml
+++ b/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/category_publication_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/variables/actor.xml
+++ b/bt5/erp5_web/WorkflowTemplateItem/portal_workflow/publication_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/business_template_building_workflow/variables/actor.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/business_template_building_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/business_template_installation_workflow/variables/actor.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/business_template_installation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_validation_workflow/variables/actor.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_validation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/edit_workflow/variables/actor.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/edit_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/variables/actor.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/preference_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/rule_validation_workflow/variables/actor.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/rule_validation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/variables/actor.xml
+++ b/product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/variables/actor.xml
@@ -59,7 +59,7 @@
      <dictionary>
        <item>
            <key> <string>text</string> </key>
-            <value> <string>user/getUserName</string> </value>
+            <value> <string>user/getIdOrUserName</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/product/ERP5Type/Workflow.py
+++ b/product/ERP5Type/Workflow.py
@@ -151,7 +151,7 @@ def setupERP5Workflow(wf):
          }),
        ('actor', {
            'description': 'Name of the user who performed transition',
-            'default_expr': 'user/getUserName',
+            'default_expr': 'user/getIdOrUserName',
            'for_status': 1,
            'update_always': 1,
          }),

--- a/product/ERP5Workflow/tests/testERP5Workflow.py
+++ b/product/ERP5Workflow/tests/testERP5Workflow.py
@@ -114,7 +114,7 @@ class TestERP5Workflow(ERP5TypeTestCase):

    v1 = workflow.newContent(portal_type='Variable',
                             title='actor',
-                             initial_value='member/getUserName')
+                             initial_value='member/getIdOrUserName')

    doc = self.portal.newContent(portal_type='Folder', id='test_doc')
    workflow.initializeDocument(doc)