use getId() instead of __str__.

bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_reset.py

@@ -30,7 +30,7 @@ for entity in ( portal.organisation_module.objectValues() +
 # enable preference
 ptool = portal.portal_preferences
 pref = ptool.accounting_zuite_preference
-if pref.owner_info()['id'] != str(context.REQUEST.AUTHENTICATED_USER):
+if pref.owner_info()['id'] != context.REQUEST.AUTHENTICATED_USER.getId():
   # we have to 'own' the preference for the test
   ptool = portal.portal_preferences
   # pref.setId('old_accounting_zuite_preference')

product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.zpt

@@ -56,7 +56,7 @@ DEPRECATION:
                 <div id="logged_in_as" class="logged_in_as">
                   <tal:block tal:condition="not: portal/portal_membership/isAnonymousUser">
                     <span class="logged_txt" i18n:translate="" i18n:domain="ui">Logged In as :</span>
-                    <tal:block tal:replace="python:portal.portal_membership.getAuthenticatedMember().getUserName()" />
+                    <tal:block tal:replace="python:portal.portal_membership.getAuthenticatedMember().getId()" />
                   </tal:block>
                 </div>
                 <p class="clear"></p>

product/ERP5Form/Tool/SelectionTool.py

@@ -1430,7 +1430,7 @@ class SelectionTool( BaseTool, SimpleItem ):
       user_id = tv.get('_user_id', None)
       if user_id is not None:
         return user_id
-      user_id = self.portal_membership.getAuthenticatedMember().getUserName()
+      user_id = self.portal_membership.getAuthenticatedMember().getId()
       tv['_user_id'] = user_id
       return user_id
 

product/ERP5Type/tests/testCookieCrumbler.py

@@ -81,7 +81,7 @@ class ERP5CookieCrumblerTests (CookieCrumblerTests):
     self.req.traverse('/')
 
     self.assert_(self.req.has_key('AUTHENTICATED_USER'))
-    self.assertEqual(self.req['AUTHENTICATED_USER'].getUserName(),
+    self.assertEqual(self.req['AUTHENTICATED_USER'].getId(),
                          'abrahammmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm')
     resp = self.req.response
     self.assert_(resp.cookies.has_key('__ac'))

product/ERP5VCS/Subversion.py

@@ -112,8 +112,8 @@ class Subversion(WorkingCopy):
     if username:
       username = username.strip()
     return (username or
-      # not set in preferences, then we get the current username in zope
-      portal.portal_membership.getAuthenticatedMember().getUserName())
+      # not set in preferences, then we get the current user id in zope
+      portal.portal_membership.getAuthenticatedMember().getId())
 
   def _getClient(self, **kw):
     return newSubversionClient(self, **kw)