diff --git a/product/ERP5/ERP5Defaults.py b/product/ERP5/ERP5Defaults.py index d5057f22cba7fb3805dcdbbcba4c3d4f160cadd7..bcb9c5cd8dc8d6f3ebfe3ef5da323001ef9834a8 100644 --- a/product/ERP5/ERP5Defaults.py +++ b/product/ERP5/ERP5Defaults.py @@ -44,6 +44,8 @@ portal_variation_type_list = ('Variation', 'Variante Tissu', 'Variante Modele', 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', diff --git a/product/ERP5/ERP5Site.py b/product/ERP5/ERP5Site.py index e76c3326934da2b6116cdcc8d4d72f3224a16cf3..da1503fcffc8c9473a100c3f603a48eb0fb213ef 100644 --- a/product/ERP5/ERP5Site.py +++ b/product/ERP5/ERP5Site.py @@ -1283,6 +1283,15 @@ class ERP5Site(FolderMixIn, CMFSite, CacheCookieMixin): """ 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): diff --git a/product/ERP5Type/ERP5Type.py b/product/ERP5Type/ERP5Type.py index e5b8146217506aedf63d08ebcb1178bc9b8e22c1..3787d601189b732dec09277bbf42bf2632a57536 100644 --- a/product/ERP5Type/ERP5Type.py +++ b/product/ERP5Type/ERP5Type.py @@ -281,6 +281,8 @@ class ERP5TypeInformation(XMLObject, 'budget_variation', # Module 'module', + # Base + 'entity', # LEGACY - needs a warning - XXX-JPS 'tax_movement', )