From a3d730e4232621584336a39dfa2313403ad7f7ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Wed, 15 Apr 2009 14:34:42 +0000
Subject: [PATCH] activity for persons must be acquired from organisation and
career
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26449 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_categories/activity.xml | 14 ++++++++++----
product/ERP5/bootstrap/erp5_core/bt/revision | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/activity.xml b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/activity.xml
index 51a892dacb..0e070fb734 100644
--- a/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/activity.xml
+++ b/product/ERP5/bootstrap/erp5_core/CategoryTemplateItem/portal_categories/activity.xml
@@ -34,7 +34,9 @@
<item>
<key> <string>acquisition_base_category</string> </key>
<value>
- <tuple/>
+ <tuple>
+ <string>subordination</string>
+ </tuple>
</value>
</item>
<item>
@@ -48,12 +50,14 @@
<item>
<key> <string>acquisition_object_id</string> </key>
<value>
- <tuple/>
+ <tuple>
+ <string>default_career</string>
+ </tuple>
</value>
</item>
<item>
<key> <string>acquisition_portal_type</string> </key>
- <value> <string>python: []</string> </value>
+ <value> <string>python: [\'Organisation\', \'Career\']</string> </value>
</item>
<item>
<key> <string>acquisition_sync_value</string> </key>
@@ -79,7 +83,9 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value>
+ <none/>
+ </value>
</item>
<item>
<key> <string>fallback_base_category</string> </key>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 019cce38b1..09486914e5 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1154
\ No newline at end of file
+1155
\ No newline at end of file
--
2.30.9