[Erp5-report] r43728 nicolas - in /erp5/trunk/products: ERP5/ ERP5Type/

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Feb 25 11:45:58 2011
New Revision: 43728

URL: http://svn.erp5.org?rev=43728&view=rev
Log:
getPortalEntityTypeList is already a reality for CRM features.
Make it explicit and configurable

Modified:
    erp5/trunk/products/ERP5/ERP5Defaults.py
    erp5/trunk/products/ERP5/ERP5Site.py
    erp5/trunk/products/ERP5Type/ERP5Type.py

Modified: erp5/trunk/products/ERP5/ERP5Defaults.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/ERP5Defaults.py?rev=43728&r1=43727&r2=43728&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/ERP5Defaults.py [utf8] (original)
+++ erp5/trunk/products/ERP5/ERP5Defaults.py [utf8] Fri Feb 25 11:45:58 2011
@@ -44,6 +44,8 @@ portal_variation_type_list = ('Variation
 portal_node_type_list = ('Organisation','Person','Category','MetaNode',
     'Account')
 
+portal_entity_type_list = ('Organisation', 'Person',)
+
 portal_payment_node_type_list = ('Bank Account', 'Credit Card', )
 
 portal_invoice_type_list = ('Invoice', 'Sale Invoice', 'Sales Invoice', 'Sale Invoice Transaction',

Modified: erp5/trunk/products/ERP5/ERP5Site.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/ERP5Site.py?rev=43728&r1=43727&r2=43728&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/ERP5Site.py [utf8] (original)
+++ erp5/trunk/products/ERP5/ERP5Site.py [utf8] Fri Feb 25 11:45:58 2011
@@ -1284,6 +1284,15 @@ class ERP5Site(FolderMixIn, CMFSite, Cac
     return self._getPortalGroupedTypeList('movement_group')
 
   security.declareProtected(Permissions.AccessContentsInformation,
+                            'getPortalEntityTypeList')
+  def getPortalEntityTypeList(self):
+    """
+    Returns Entity types.
+    """
+    return self._getPortalGroupedTypeList('entity') or\
+           self._getPortalConfiguration('portal_entity_type_list')
+
+  security.declareProtected(Permissions.AccessContentsInformation,
                             'getDefaultModuleId')
   def getDefaultModuleId(self, portal_type, default=MARKER):
     """

Modified: erp5/trunk/products/ERP5Type/ERP5Type.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/ERP5Type.py?rev=43728&r1=43727&r2=43728&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/ERP5Type.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/ERP5Type.py [utf8] Fri Feb 25 11:45:58 2011
@@ -281,6 +281,8 @@ class ERP5TypeInformation(XMLObject,
       'budget_variation',
       # Module
       'module',
+      # Base
+      'entity',
       # LEGACY - needs a warning - XXX-JPS
       'tax_movement',
     )