2010-06-23 mayoro

* Change filter expression in z_catalog_egov_list
* Allow Agent and Owner to delete procedure in draft state

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

bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml

@@ -6,6 +6,6 @@
   <value>1</value>
  </item>
  <item key="_filter_expression_archive" type="str">
-  <value>python: here.getPortalType() in ('M0','M0 Bis','M2','M2 Bis','M4','P0','P2','P4','S1','S5','Subscription Form','Declaration TVA','Mandate Form', 'Organisation', 'Assignment')</value>
+  <value>python: context.getPortalType() in ( 'Organisation', 'Assignment') or  context.getTypeInfo().getPortalType() == 'EGov Type'</value>
  </item>
 </catalog_method>

bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_universal_workflow/states/draft.xml

@@ -77,6 +77,7 @@
                     <value>
                       <tuple>
                         <string>Agent</string>
+                        <string>Manager</string>
                         <string>Owner</string>
                       </tuple>
                     </value>
@@ -84,7 +85,10 @@
                 <item>
                     <key> <string>Delete objects</string> </key>
                     <value>
-                      <tuple/>
+                      <tuple>
+                        <string>Agent</string>
+                        <string>Owner</string>
+                      </tuple>
                     </value>
                 </item>
                 <item>
@@ -99,7 +103,10 @@
                 <item>
                     <key> <string>Set own password</string> </key>
                     <value>
-                      <tuple/>
+                      <tuple>
+                        <string>Agent</string>
+                        <string>Owner</string>
+                      </tuple>
                     </value>
                 </item>
                 <item>

bt5/erp5_egov/bt/change_log

+2010-06-23 mayoro
+* Change filter expression in z_catalog_egov_list
+* Allow Agent and Owner to delete procedure in draft state
+
 2010-06-23 mayoro
 * correct redirect url when logout
 * display login and password to track anonymous procedure at the end of submission (it's not only for Subscription Form)

bt5/erp5_egov/bt/revision

-599
\ No newline at end of file
+602
\ No newline at end of file