changes some categories to use new ones

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21723 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_view/my_reference.xml

@@ -265,18 +265,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:here.getRole()==\'registry\'</string> </value>
+            <value> <string>python: \'entreprise\' in here.getRole()</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_egov/TestTemplateItem/testEGovMixin.py

@@ -176,9 +176,9 @@ class TestEGovMixin(SecurityTestCase):
     module = self.getOrganisationModule()
     if len(module.getObjectIds()) == 0:
       self.createOneOrganisation(self.organisation_1_login, 
-          role='registry/entreprise')
+          role='entreprise/siege')
       self.createOneOrganisation(self.organisation_2_login, 
-          role='registry/entreprise')
+          role='entreprise/siege')
 
       # make this available to catalog
       get_transaction().commit()

bt5/erp5_egov/bt/revision

-175
\ No newline at end of file
+176
\ No newline at end of file