Computer Partition should acquire region from parent.

Conflicts: bt5/erp5_base/bt/revision

Computer Partition should acquire region from parent.
Conflicts: bt5/erp5_base/bt/revision
20682986 · Romain Courteaud · Rafael Monnerat · 4f42be04 · 20682986
Commit 20682986 authored Feb 08, 2013 by Romain Courteaud 🐙 Committed by Rafael Monnerat Nov 12, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml ...p5_base/CategoryTemplateItem/portal_categories/region.xml +5 -2

No files found.
--- a/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
+++ b/bt5/erp5_base/CategoryTemplateItem/portal_categories/region.xml
@@ -33,6 +33,7 @@
            <value>
              <tuple>
                <string>subordination</string>
+                <string>parent</string>
              </tuple>
            </value>
        </item>
@@ -54,7 +55,7 @@
        </item>
        <item>
            <key> <string>acquisition_portal_type</string> </key>
-            <value> <string>python: [\'Address\', \'Organisation\', \'Person\']</string> </value>
+            <value> <string>python: [\'Address\', \'Organisation\', \'Person\', \'Computer\']</string> </value>
        </item>
        <item>
            <key> <string>acquisition_sync_value</string> </key>
@@ -80,7 +81,9 @@
        </item>
        <item>
            <key> <string>description</string> </key>
-            <value> <string></string> </value>
+            <value>
+              <none/>
+            </value>
        </item>
        <item>
            <key> <string>fallback_base_category</string> </key>