From a31f9deccbee5157002d463b992a4d60ef79e352 Mon Sep 17 00:00:00 2001
From: Jean-Paul Smets <jp@nexedi.com>
Date: Sun, 8 Feb 2004 17:10:46 +0000
Subject: [PATCH] addPermission changed to addPortalContent fixed Solanes typo

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@404 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/Coramy/Document/Composant.py                      | 4 ++--
 product/Coramy/Document/Container.py                      | 4 ++--
 product/Coramy/Document/ContainerLine.py                  | 4 ++--
 product/Coramy/Document/DeliveryLine.py                   | 4 ++--
 product/Coramy/Document/Discount.py                       | 4 ++--
 product/Coramy/Document/ElementTarif.py                   | 4 ++--
 product/Coramy/Document/Forme.py                          | 4 ++--
 product/Coramy/Document/Gamme.py                          | 2 +-
 product/Coramy/Document/GrilleConsommation.py             | 2 +-
 product/Coramy/Document/Inventory.py                      | 2 +-
 product/Coramy/Document/InventoryLine.py                  | 4 ++--
 product/Coramy/Document/Invoice.py                        | 4 ++--
 product/Coramy/Document/Item.py                           | 4 ++--
 product/Coramy/Document/Machine.py                        | 4 ++--
 product/Coramy/Document/Modele.py                         | 4 ++--
 product/Coramy/Document/ModeleMachine.py                  | 4 ++--
 product/Coramy/Document/Morceau.py                        | 2 +-
 product/Coramy/Document/Nomenclature.py                   | 4 ++--
 product/Coramy/Document/Operation.py                      | 4 ++--
 product/Coramy/Document/OptionMachine.py                  | 2 +-
 product/Coramy/Document/Order.py                          | 4 ++--
 product/Coramy/Document/OrderLine.py                      | 4 ++--
 product/Coramy/Document/PackingList.py                    | 4 ++--
 product/Coramy/Document/PaymentCondition.py               | 4 ++--
 product/Coramy/Document/ProductionOrder.py                | 4 ++--
 product/Coramy/Document/ProductionReport.py               | 4 ++--
 product/Coramy/Document/ProductionReportCell.py           | 4 ++--
 product/Coramy/Document/ProductionReportLine.py           | 4 ++--
 product/Coramy/Document/SampleOrderLine.py                | 4 ++--
 product/Coramy/Document/SamplesOrder.py                   | 4 ++--
 product/Coramy/Document/SamplesPackingList.py             | 4 ++--
 product/Coramy/Document/Tissu.py                          | 4 ++--
 product/Coramy/Document/TradeCondition.py                 | 4 ++--
 product/Coramy/Document/Transformation.py                 | 4 ++--
 product/Coramy/Document/TransformedResource.py            | 4 ++--
 product/Coramy/Document/VarianteComposant.py              | 4 ++--
 product/Coramy/Document/VarianteGamme.py                  | 2 +-
 product/Coramy/Document/VarianteModele.py                 | 4 ++--
 product/Coramy/Document/VarianteMorphologique.py          | 4 ++--
 product/Coramy/Document/VarianteTissu.py                  | 4 ++--
 product/Coramy/Document/VariatedReference.py              | 4 ++--
 product/Coramy/Document/Vetement.py                       | 2 +-
 product/Coramy/PropertySheet/Assortiment.py               | 2 +-
 product/Coramy/PropertySheet/Coloris.py                   | 2 +-
 product/Coramy/PropertySheet/Composant.py                 | 2 +-
 product/Coramy/PropertySheet/CoramyItem.py                | 2 +-
 product/Coramy/PropertySheet/CoramyTransformation.py      | 2 +-
 product/Coramy/PropertySheet/CoramyTransformedResource.py | 2 +-
 product/Coramy/PropertySheet/CorrespondanceMesures.py     | 2 +-
 product/Coramy/PropertySheet/CorrespondanceTailles.py     | 2 +-
 product/Coramy/PropertySheet/GrilleConsommation.py        | 2 +-
 product/Coramy/PropertySheet/LigneNomenclature.py         | 2 +-
 product/Coramy/PropertySheet/Machine.py                   | 2 +-
 product/Coramy/PropertySheet/Modele.py                    | 2 +-
 product/Coramy/PropertySheet/ModeleMachine.py             | 2 +-
 product/Coramy/PropertySheet/Operation.py                 | 2 +-
 product/Coramy/PropertySheet/SamplesPackingList.py        | 2 +-
 product/Coramy/PropertySheet/Tissu.py                     | 2 +-
 product/Coramy/PropertySheet/VariatedReference.py         | 2 +-
 product/ERP5/Document/Account.py                          | 4 ++--
 product/ERP5/Document/AccountingTransactionLine.py        | 4 ++--
 product/ERP5/Document/Amount.py                           | 2 +-
 product/ERP5/Document/AmountFilter.py                     | 2 +-
 product/ERP5/Document/AppliedRule.py                      | 6 ++++--
 product/ERP5/Document/Assignment.py                       | 4 ++--
 product/ERP5/Document/BankAccount.py                      | 4 ++--
 product/ERP5/Document/Binder.py                           | 2 +-
 product/ERP5/Document/BusinessTemplate.py                 | 4 ++--
 product/ERP5/Document/Capacity.py                         | 2 +-
 product/ERP5/Document/ComplementPredicate.py              | 4 ++--
 product/ERP5/Document/Container.py                        | 4 ++--
 product/ERP5/Document/ContainerCell.py                    | 4 ++--
 product/ERP5/Document/ContainerLine.py                    | 4 ++--
 product/ERP5/Document/Coordinate.py                       | 2 +-
 product/ERP5/Document/DeliveryCell.py                     | 4 ++--
 product/ERP5/Document/DependentCapacity.py                | 4 ++--
 product/ERP5/Document/Device.py                           | 2 +-
 product/ERP5/Document/Discount.py                         | 4 ++--
 product/ERP5/Document/Document.py                         | 2 +-
 product/ERP5/Document/Domain.py                           | 4 ++--
 product/ERP5/Document/Event.py                            | 2 +-
 product/ERP5/Document/File.py                             | 2 +-
 product/ERP5/Document/GeographicAddress.py                | 4 ++--
 product/ERP5/Document/Image.py                            | 2 +-
 product/ERP5/Document/IndependentCapacity.py              | 2 +-
 product/ERP5/Document/Inventory.py                        | 2 +-
 product/ERP5/Document/Invoice.py                          | 4 ++--
 product/ERP5/Document/InvoiceCell.py                      | 4 ++--
 product/ERP5/Document/InvoiceLine.py                      | 4 ++--
 product/ERP5/Document/Item.py                             | 4 ++--
 product/ERP5/Document/Machine.py                          | 4 ++--
 product/ERP5/Document/MailMessage.py                      | 4 ++--
 product/ERP5/Document/MappedValue.py                      | 4 ++--
 product/ERP5/Document/MetaNode.py                         | 4 ++--
 product/ERP5/Document/MetaResource.py                     | 4 ++--
 product/ERP5/Document/Movement.py                         | 5 ++---
 product/ERP5/Document/MultivaluePredicate.py              | 4 ++--
 product/ERP5/Document/OrderLine.py                        | 4 ++--
 product/ERP5/Document/Organisation.py                     | 4 ++--
 product/ERP5/Document/PackingList.py                      | 4 ++--
 product/ERP5/Document/Path.py                             | 4 ++--
 product/ERP5/Document/PaySheet.py                         | 4 ++--
 product/ERP5/Document/PaymentCondition.py                 | 4 ++--
 product/ERP5/Document/Person.py                           | 4 ++--
 product/ERP5/Document/Predicate.py                        | 2 +-
 product/ERP5/Document/PredicateGroup.py                   | 4 ++--
 product/ERP5/Document/Pricing.py                          | 4 ++--
 product/ERP5/Document/ProductionReport.py                 | 4 ++--
 product/ERP5/Document/ProductionReportCell.py             | 4 ++--
 product/ERP5/Document/ProductionReportLine.py             | 4 ++--
 product/ERP5/Document/Project.py                          | 2 +-
 product/ERP5/Document/ProjectReport.py                    | 2 +-
 product/ERP5/Document/ReportTopic.py                      | 4 ++--
 product/ERP5/Document/Resource.py                         | 4 ++--
 product/ERP5/Document/Rule.py                             | 4 ++--
 product/ERP5/Document/SaleOpportunity.py                  | 4 ++--
 product/ERP5/Document/Segment.py                          | 4 ++--
 product/ERP5/Document/SetMappedValue.py                   | 4 ++--
 product/ERP5/Document/SetPredicate.py                     | 4 ++--
 product/ERP5/Document/SetPricing.py                       | 4 ++--
 product/ERP5/Document/Supply.py                           | 2 +-
 product/ERP5/Document/SupplyCell.py                       | 4 ++--
 product/ERP5/Document/SupplyLine.py                       | 4 ++--
 product/ERP5/Document/Telephone.py                        | 4 ++--
 product/ERP5/Document/TradeCondition.py                   | 4 ++--
 product/ERP5/Document/Transaction.py                      | 4 ++--
 product/ERP5/Document/Transformation.py                   | 2 +-
 product/ERP5/Document/TransformedResource.py              | 4 ++--
 product/ERP5/Document/Url.py                              | 2 +-
 product/ERP5/Document/ValuePredicate.py                   | 4 ++--
 product/ERP5/Document/VariatedProperty.py                 | 4 ++--
 product/ERP5/Document/Variation.py                        | 4 ++--
 product/ERP5/Document/VariationRange.py                   | 4 ++--
 product/ERP5/Document/ZeroStockRule.py                    | 2 +-
 134 files changed, 227 insertions(+), 226 deletions(-)

diff --git a/product/Coramy/Document/Composant.py b/product/Coramy/Document/Composant.py
index f799cce8aa..89cfb5196a 100755
--- a/product/Coramy/Document/Composant.py
+++ b/product/Coramy/Document/Composant.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -39,7 +39,7 @@ class Composant(Resource):
 
     meta_type = 'CORAMY Composant'
     portal_type = 'Composant'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Container.py b/product/Coramy/Document/Container.py
index 8a74ba078a..51458b4d04 100755
--- a/product/Coramy/Document/Container.py
+++ b/product/Coramy/Document/Container.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -49,7 +49,7 @@ class Container(ERP5Container):
 
     meta_type = 'CORAMY Container'
     portal_type = 'Container'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/ContainerLine.py b/product/Coramy/Document/ContainerLine.py
index 19dc481364..dd82153e94 100755
--- a/product/Coramy/Document/ContainerLine.py
+++ b/product/Coramy/Document/ContainerLine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -43,7 +43,7 @@ class ContainerLine(ERP5ContainerLine):
 
     meta_type = 'CORAMY Container Line'
     portal_type = 'Container Line'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/DeliveryLine.py b/product/Coramy/Document/DeliveryLine.py
index 652c2b2f6c..c307e7ff97 100755
--- a/product/Coramy/Document/DeliveryLine.py
+++ b/product/Coramy/Document/DeliveryLine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,7 +42,7 @@ class DeliveryLine(ERP5DeliveryLine):
     """
     meta_type = 'CORAMY Delivery Line'
     portal_type = 'Delivery Line'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Discount.py b/product/Coramy/Document/Discount.py
index dbb64f98a2..0cebba64c1 100755
--- a/product/Coramy/Document/Discount.py
+++ b/product/Coramy/Document/Discount.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -39,7 +39,7 @@ class Discount(ERP5Discount):
 
     meta_type = 'CORAMY Discount'
     portal_type = 'Discount'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/ElementTarif.py b/product/Coramy/Document/ElementTarif.py
index 63072deb50..853e819e95 100755
--- a/product/Coramy/Document/ElementTarif.py
+++ b/product/Coramy/Document/ElementTarif.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -43,7 +43,7 @@ class ElementTarif(ERP5MappedValue, XMLMatrix):
 
     meta_type = 'CORAMY Element Tarif'
     portal_type = 'Element Tarif'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Forme.py b/product/Coramy/Document/Forme.py
index eef0690ead..b10e9ac613 100755
--- a/product/Coramy/Document/Forme.py
+++ b/product/Coramy/Document/Forme.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -39,7 +39,7 @@ class Forme(Resource):
 
     meta_type = 'CORAMY Forme'
     portal_type = 'Forme'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Gamme.py b/product/Coramy/Document/Gamme.py
index 5af207ffe1..6bc706fd3b 100755
--- a/product/Coramy/Document/Gamme.py
+++ b/product/Coramy/Document/Gamme.py
@@ -38,7 +38,7 @@ class Gamme(Resource):
 
     meta_type = 'CORAMY Gamme'
     portal_type = 'Gamme'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/GrilleConsommation.py b/product/Coramy/Document/GrilleConsommation.py
index 82361fcd3b..25bf4c3abe 100755
--- a/product/Coramy/Document/GrilleConsommation.py
+++ b/product/Coramy/Document/GrilleConsommation.py
@@ -44,7 +44,7 @@ class GrilleConsommation(XMLObject, XMLMatrix):
 
     meta_type = 'CORAMY Grille Consommation'
     portal_type = 'Grille Consommation'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Inventory.py b/product/Coramy/Document/Inventory.py
index 387395cec2..f5550b8eca 100755
--- a/product/Coramy/Document/Inventory.py
+++ b/product/Coramy/Document/Inventory.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/Document/InventoryLine.py b/product/Coramy/Document/InventoryLine.py
index ccd8ed1b8a..66a7df0c8f 100755
--- a/product/Coramy/Document/InventoryLine.py
+++ b/product/Coramy/Document/InventoryLine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,7 +42,7 @@ class InventoryLine(ERP5InventoryLine):
 
     meta_type = 'CORAMY Inventory Line'
     portal_type = 'Inventory Line'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Invoice.py b/product/Coramy/Document/Invoice.py
index 4fa5bc8530..08e30b3bd8 100755
--- a/product/Coramy/Document/Invoice.py
+++ b/product/Coramy/Document/Invoice.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,7 +42,7 @@ class Invoice(ERP5Invoice):
     """
     meta_type = 'CORAMY Invoice'
     portal_type = 'Invoice'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Item.py b/product/Coramy/Document/Item.py
index 5c6b5d0534..108b1211c3 100755
--- a/product/Coramy/Document/Item.py
+++ b/product/Coramy/Document/Item.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,7 +42,7 @@ class Item(ERP5Item):
 
     meta_type = 'CORAMY Item'
     portal_type = 'Item'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Machine.py b/product/Coramy/Document/Machine.py
index a2d18272d1..2d13d7bbf1 100755
--- a/product/Coramy/Document/Machine.py
+++ b/product/Coramy/Document/Machine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#          Jean-Paul Smets-Solane <jp@nexedi.com>
+#          Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -37,7 +37,7 @@ class Machine(Item):
 
     meta_type = 'CORAMY Machine'
     portal_type = 'Machine'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Modele.py b/product/Coramy/Document/Modele.py
index 4698bc3001..feb37a5c10 100755
--- a/product/Coramy/Document/Modele.py
+++ b/product/Coramy/Document/Modele.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -43,7 +43,7 @@ class Modele(Resource, XMLMatrix):
 
     meta_type = 'CORAMY Modele'
     portal_type = 'Modele'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/ModeleMachine.py b/product/Coramy/Document/ModeleMachine.py
index e4283cb322..928004e424 100755
--- a/product/Coramy/Document/ModeleMachine.py
+++ b/product/Coramy/Document/ModeleMachine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,7 +42,7 @@ class ModeleMachine(Resource, Folder):
 
     meta_type = 'CORAMY Modele Machine'
     portal_type = 'Modele Machine'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Morceau.py b/product/Coramy/Document/Morceau.py
index 8942d203d2..f36154ed45 100755
--- a/product/Coramy/Document/Morceau.py
+++ b/product/Coramy/Document/Morceau.py
@@ -39,7 +39,7 @@ class Morceau(XMLObject):
 
     meta_type = 'CORAMY Morceau'
     portal_type = 'Morceau'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Nomenclature.py b/product/Coramy/Document/Nomenclature.py
index 379001ff88..20a32fecae 100755
--- a/product/Coramy/Document/Nomenclature.py
+++ b/product/Coramy/Document/Nomenclature.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -49,7 +49,7 @@ class Nomenclature(Transformation):
 
     meta_type = 'CORAMY Nomenclature'
     portal_type = 'Nomenclature'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Operation.py b/product/Coramy/Document/Operation.py
index bb47206a74..2432cd8251 100755
--- a/product/Coramy/Document/Operation.py
+++ b/product/Coramy/Document/Operation.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -43,7 +43,7 @@ class Operation(Resource, XMLMatrix):
 
     meta_type = 'CORAMY Operation'
     portal_type = 'Operation'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/OptionMachine.py b/product/Coramy/Document/OptionMachine.py
index 9cd51c4044..84fe529bf3 100755
--- a/product/Coramy/Document/OptionMachine.py
+++ b/product/Coramy/Document/OptionMachine.py
@@ -37,7 +37,7 @@ class OptionMachine(Variation):
 
     meta_type = 'CORAMY Option Machine'
     portal_type = 'Option Machine'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Order.py b/product/Coramy/Document/Order.py
index 73994e6574..2a05e0c19f 100755
--- a/product/Coramy/Document/Order.py
+++ b/product/Coramy/Document/Order.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,7 +42,7 @@ class Order(ERP5Order):
 
     meta_type = 'CORAMY Order'
     portal_type = 'Order'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/OrderLine.py b/product/Coramy/Document/OrderLine.py
index 89a549a8d2..f7d280b5a5 100755
--- a/product/Coramy/Document/OrderLine.py
+++ b/product/Coramy/Document/OrderLine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -43,7 +43,7 @@ class OrderLine(ERP5OrderLine):
 
     meta_type = 'CORAMY Order Line'
     portal_type = 'Order Line'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/PackingList.py b/product/Coramy/Document/PackingList.py
index 7c3633b552..28492752fd 100755
--- a/product/Coramy/Document/PackingList.py
+++ b/product/Coramy/Document/PackingList.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -36,7 +36,7 @@ class PackingList(ERP5PackingList):
     # CMF Type Definition
     meta_type = 'CORAMY Packing List'
     portal_type = 'Packing List'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/PaymentCondition.py b/product/Coramy/Document/PaymentCondition.py
index a07b3bd9de..5c7f970bea 100755
--- a/product/Coramy/Document/PaymentCondition.py
+++ b/product/Coramy/Document/PaymentCondition.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -39,7 +39,7 @@ class PaymentCondition(ERP5PaymentCondition):
 
     meta_type = 'CORAMY Payment Condition'
     portal_type = 'Payment Condition'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/ProductionOrder.py b/product/Coramy/Document/ProductionOrder.py
index 207eeb2080..ca1247ba7d 100755
--- a/product/Coramy/Document/ProductionOrder.py
+++ b/product/Coramy/Document/ProductionOrder.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -45,7 +45,7 @@ class ProductionOrder(ERP5Order):
 
     meta_type = 'CORAMY Production Order'
     portal_type = 'Production Order'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/ProductionReport.py b/product/Coramy/Document/ProductionReport.py
index 588ea7448a..6552b006ef 100755
--- a/product/Coramy/Document/ProductionReport.py
+++ b/product/Coramy/Document/ProductionReport.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,7 +42,7 @@ class ProductionReport(ERP5ProductionReport):
     # CMF Type Definition
     meta_type = 'CORAMY Production Report'
     portal_type = 'Production Report'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/ProductionReportCell.py b/product/Coramy/Document/ProductionReportCell.py
index cf643eca80..401d249a48 100755
--- a/product/Coramy/Document/ProductionReportCell.py
+++ b/product/Coramy/Document/ProductionReportCell.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -43,7 +43,7 @@ class ProductionReportCell(ERP5ProductionReportCell):
 
     meta_type = 'CORAMY Production Report Cell'
     portal_type = 'Production Report Cell'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
     isMovement = 1
diff --git a/product/Coramy/Document/ProductionReportLine.py b/product/Coramy/Document/ProductionReportLine.py
index ad18dc1669..e497869806 100755
--- a/product/Coramy/Document/ProductionReportLine.py
+++ b/product/Coramy/Document/ProductionReportLine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -41,7 +41,7 @@ class ProductionReportLine(ERP5ProductionReportLine):
 
   meta_type = 'CORAMY Production Report Line'
   portal_type = 'Production Report Line'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/Coramy/Document/SampleOrderLine.py b/product/Coramy/Document/SampleOrderLine.py
index 5fcfc11ffb..146026c83a 100755
--- a/product/Coramy/Document/SampleOrderLine.py
+++ b/product/Coramy/Document/SampleOrderLine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -44,7 +44,7 @@ class SampleOrderLine(OrderLine, ElementTarif):
 
     meta_type = 'CORAMY Sample Order Line'
     portal_type = 'Sample Order Line'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/SamplesOrder.py b/product/Coramy/Document/SamplesOrder.py
index 4a39e66ddb..43577253f3 100755
--- a/product/Coramy/Document/SamplesOrder.py
+++ b/product/Coramy/Document/SamplesOrder.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -45,7 +45,7 @@ class SamplesOrder(ERP5Order):
 
     meta_type = 'CORAMY Samples Order'
     portal_type = 'Samples Order'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/SamplesPackingList.py b/product/Coramy/Document/SamplesPackingList.py
index 3154f030f1..f9189ab653 100755
--- a/product/Coramy/Document/SamplesPackingList.py
+++ b/product/Coramy/Document/SamplesPackingList.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,7 +42,7 @@ class SamplesPackingList(ERP5PackingList):
     """
     meta_type = 'CORAMY Samples Packing List'
     portal_type = 'Samples Packing List'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Tissu.py b/product/Coramy/Document/Tissu.py
index 87b4a2d0ba..a145966218 100755
--- a/product/Coramy/Document/Tissu.py
+++ b/product/Coramy/Document/Tissu.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -39,7 +39,7 @@ class Tissu(Resource):
 
     meta_type = 'CORAMY Tissu'
     portal_type = 'Tissu'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/TradeCondition.py b/product/Coramy/Document/TradeCondition.py
index 5290ef054c..3c5cee8632 100755
--- a/product/Coramy/Document/TradeCondition.py
+++ b/product/Coramy/Document/TradeCondition.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -41,7 +41,7 @@ class TradeCondition(ERP5TradeCondition):
 
     meta_type = 'CORAMY Trade Condition'
     portal_type = 'Trade Condition'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Transformation.py b/product/Coramy/Document/Transformation.py
index 4d0cbef31f..b7439bf323 100755
--- a/product/Coramy/Document/Transformation.py
+++ b/product/Coramy/Document/Transformation.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -51,7 +51,7 @@ class Transformation(ERP5Transformation):
 
     meta_type = 'CORAMY Transformation'
     portal_type = 'Transformation'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/TransformedResource.py b/product/Coramy/Document/TransformedResource.py
index ce88d8287a..f3bab0036a 100755
--- a/product/Coramy/Document/TransformedResource.py
+++ b/product/Coramy/Document/TransformedResource.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -46,7 +46,7 @@ class TransformedResource(ERP5TransformedResource):
 
     meta_type = 'CORAMY Transformed Resource'
     portal_type = 'Transformed Resource'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/VarianteComposant.py b/product/Coramy/Document/VarianteComposant.py
index f2fefd55d2..aa06ad6c52 100755
--- a/product/Coramy/Document/VarianteComposant.py
+++ b/product/Coramy/Document/VarianteComposant.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -41,7 +41,7 @@ class VarianteComposant(Image, Variation):
 
     meta_type = 'CORAMY Variante Composant'
     portal_type = 'Variante Composant'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/VarianteGamme.py b/product/Coramy/Document/VarianteGamme.py
index 1e0730c928..325a8dc368 100755
--- a/product/Coramy/Document/VarianteGamme.py
+++ b/product/Coramy/Document/VarianteGamme.py
@@ -37,7 +37,7 @@ class VarianteGamme(Variation):
 
     meta_type = 'CORAMY Variante Gamme'
     portal_type = 'Variante Gamme'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/VarianteModele.py b/product/Coramy/Document/VarianteModele.py
index 26311eb51f..7f19a6314e 100755
--- a/product/Coramy/Document/VarianteModele.py
+++ b/product/Coramy/Document/VarianteModele.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -40,7 +40,7 @@ class VarianteModele(Image, Variation):
 
     meta_type = 'CORAMY Variante Modele'
     portal_type = 'Variante Modele'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/VarianteMorphologique.py b/product/Coramy/Document/VarianteMorphologique.py
index cfe998b262..fa5256020e 100755
--- a/product/Coramy/Document/VarianteMorphologique.py
+++ b/product/Coramy/Document/VarianteMorphologique.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -38,7 +38,7 @@ class VarianteMorphologique(Variation):
 
     meta_type = 'CORAMY Variante Morphologique'
     portal_type = 'Variante Morphologique'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/VarianteTissu.py b/product/Coramy/Document/VarianteTissu.py
index 03bd58fee8..0c267f8a4e 100755
--- a/product/Coramy/Document/VarianteTissu.py
+++ b/product/Coramy/Document/VarianteTissu.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -39,7 +39,7 @@ class VarianteTissu(Image, Variation):
 
     meta_type = 'CORAMY Variante Tissu'
     portal_type = 'Variante Tissu'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/VariatedReference.py b/product/Coramy/Document/VariatedReference.py
index 99953013f3..114b2b17a5 100755
--- a/product/Coramy/Document/VariatedReference.py
+++ b/product/Coramy/Document/VariatedReference.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -48,7 +48,7 @@ class VariatedReference(XMLObject, XMLMatrix):
 
     meta_type = 'CORAMY Variated Reference'
     portal_type = 'Variated Reference'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/Document/Vetement.py b/product/Coramy/Document/Vetement.py
index e449600303..c374359384 100755
--- a/product/Coramy/Document/Vetement.py
+++ b/product/Coramy/Document/Vetement.py
@@ -42,7 +42,7 @@ class Vetement(Resource, XMLMatrix):
 
     meta_type = 'CORAMY Vetement'
     portal_type = 'Vetement'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/Coramy/PropertySheet/Assortiment.py b/product/Coramy/PropertySheet/Assortiment.py
index 23b27462eb..571a03c51d 100755
--- a/product/Coramy/PropertySheet/Assortiment.py
+++ b/product/Coramy/PropertySheet/Assortiment.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#          Jean-Paul Smets-Solane <jp@nexedi.com>
+#          Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/Coloris.py b/product/Coramy/PropertySheet/Coloris.py
index 7cd4919cf7..dacac893ff 100755
--- a/product/Coramy/PropertySheet/Coloris.py
+++ b/product/Coramy/PropertySheet/Coloris.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#          Jean-Paul Smets-Solane <jp@nexedi.com>
+#          Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/Composant.py b/product/Coramy/PropertySheet/Composant.py
index 56a3f9df56..d1d71f9c6b 100755
--- a/product/Coramy/PropertySheet/Composant.py
+++ b/product/Coramy/PropertySheet/Composant.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/CoramyItem.py b/product/Coramy/PropertySheet/CoramyItem.py
index 703c9d51f8..1bc8cc329a 100755
--- a/product/Coramy/PropertySheet/CoramyItem.py
+++ b/product/Coramy/PropertySheet/CoramyItem.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/CoramyTransformation.py b/product/Coramy/PropertySheet/CoramyTransformation.py
index 36ccd5a74f..33352d5745 100755
--- a/product/Coramy/PropertySheet/CoramyTransformation.py
+++ b/product/Coramy/PropertySheet/CoramyTransformation.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/CoramyTransformedResource.py b/product/Coramy/PropertySheet/CoramyTransformedResource.py
index 97977f909f..8efe9a7992 100755
--- a/product/Coramy/PropertySheet/CoramyTransformedResource.py
+++ b/product/Coramy/PropertySheet/CoramyTransformedResource.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/CorrespondanceMesures.py b/product/Coramy/PropertySheet/CorrespondanceMesures.py
index 1bb09edd19..e580d31cf4 100755
--- a/product/Coramy/PropertySheet/CorrespondanceMesures.py
+++ b/product/Coramy/PropertySheet/CorrespondanceMesures.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#          Jean-Paul Smets-Solane <jp@nexedi.com>
+#          Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/CorrespondanceTailles.py b/product/Coramy/PropertySheet/CorrespondanceTailles.py
index be5869ea81..2214e34afa 100755
--- a/product/Coramy/PropertySheet/CorrespondanceTailles.py
+++ b/product/Coramy/PropertySheet/CorrespondanceTailles.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#          Jean-Paul Smets-Solane <jp@nexedi.com>
+#          Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/GrilleConsommation.py b/product/Coramy/PropertySheet/GrilleConsommation.py
index 5406ade9c2..52d424c324 100755
--- a/product/Coramy/PropertySheet/GrilleConsommation.py
+++ b/product/Coramy/PropertySheet/GrilleConsommation.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#          Jean-Paul Smets-Solane <jp@nexedi.com>
+#          Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/LigneNomenclature.py b/product/Coramy/PropertySheet/LigneNomenclature.py
index 6e6f54330f..b43caa74e7 100755
--- a/product/Coramy/PropertySheet/LigneNomenclature.py
+++ b/product/Coramy/PropertySheet/LigneNomenclature.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#          Jean-Paul Smets-Solane <jp@nexedi.com>
+#          Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/Machine.py b/product/Coramy/PropertySheet/Machine.py
index 86039540ea..7232ced3f7 100755
--- a/product/Coramy/PropertySheet/Machine.py
+++ b/product/Coramy/PropertySheet/Machine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#          Jean-Paul Smets-Solane <jp@nexedi.com>
+#          Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/Modele.py b/product/Coramy/PropertySheet/Modele.py
index 7564cccce1..019c6e8725 100755
--- a/product/Coramy/PropertySheet/Modele.py
+++ b/product/Coramy/PropertySheet/Modele.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#          Jean-Paul Smets-Solane <jp@nexedi.com>
+#          Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/ModeleMachine.py b/product/Coramy/PropertySheet/ModeleMachine.py
index c88649d089..2ccd45c5cc 100755
--- a/product/Coramy/PropertySheet/ModeleMachine.py
+++ b/product/Coramy/PropertySheet/ModeleMachine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#          Jean-Paul Smets-Solane <jp@nexedi.com>
+#          Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/Operation.py b/product/Coramy/PropertySheet/Operation.py
index 7aad69b9e7..9118cbaa70 100755
--- a/product/Coramy/PropertySheet/Operation.py
+++ b/product/Coramy/PropertySheet/Operation.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#          Jean-Paul Smets-Solane <jp@nexedi.com>
+#          Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/SamplesPackingList.py b/product/Coramy/PropertySheet/SamplesPackingList.py
index 9dbc7e5d0f..fb21c6dc0a 100755
--- a/product/Coramy/PropertySheet/SamplesPackingList.py
+++ b/product/Coramy/PropertySheet/SamplesPackingList.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/Tissu.py b/product/Coramy/PropertySheet/Tissu.py
index 0a80a7ac68..de265d218f 100755
--- a/product/Coramy/PropertySheet/Tissu.py
+++ b/product/Coramy/PropertySheet/Tissu.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/Coramy/PropertySheet/VariatedReference.py b/product/Coramy/PropertySheet/VariatedReference.py
index 805052dc54..d6cfd3a53c 100755
--- a/product/Coramy/PropertySheet/VariatedReference.py
+++ b/product/Coramy/PropertySheet/VariatedReference.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/Account.py b/product/ERP5/Document/Account.py
index 53b07a4a59..215420a7b3 100755
--- a/product/ERP5/Document/Account.py
+++ b/product/ERP5/Document/Account.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -64,7 +64,7 @@ class Account(MetaNode, XMLObject):
 
     meta_type = 'ERP5 Account'
     portal_type = 'Account'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/AccountingTransactionLine.py b/product/ERP5/Document/AccountingTransactionLine.py
index 42a37348ea..00faa12ec2 100755
--- a/product/ERP5/Document/AccountingTransactionLine.py
+++ b/product/ERP5/Document/AccountingTransactionLine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -40,7 +40,7 @@ class AccountingTransactionLine(DeliveryLine):
 
   meta_type = 'ERP5 Accounting Transaction Line'
   portal_type = 'Accounting Transaction Line'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/ERP5/Document/Amount.py b/product/ERP5/Document/Amount.py
index 96e6a8cda2..2e5446d83b 100755
--- a/product/ERP5/Document/Amount.py
+++ b/product/ERP5/Document/Amount.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/AmountFilter.py b/product/ERP5/Document/AmountFilter.py
index 35d1fab246..4dd78dd291 100755
--- a/product/ERP5/Document/AmountFilter.py
+++ b/product/ERP5/Document/AmountFilter.py
@@ -55,7 +55,7 @@ class AmountFilter(SetMappedValue, Amount):
 
     meta_type = 'ERP5 Amount Filter'
     portal_type = 'Amount Filter'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/AppliedRule.py b/product/ERP5/Document/AppliedRule.py
index cccda2819a..ed7969dc43 100755
--- a/product/ERP5/Document/AppliedRule.py
+++ b/product/ERP5/Document/AppliedRule.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -56,7 +56,7 @@ class AppliedRule(XMLObject):
     # CMF Type Definition
     meta_type = 'ERP5 Applied Rule'
     portal_type = 'Applied Rule'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
@@ -301,3 +301,5 @@ An ERP5 Rule..."""
 
     # Psyco optimizations
     psyco.bind(getMovementIndex)
+
+
diff --git a/product/ERP5/Document/Assignment.py b/product/ERP5/Document/Assignment.py
index ce92de651a..bdbbd56285 100755
--- a/product/ERP5/Document/Assignment.py
+++ b/product/ERP5/Document/Assignment.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -36,7 +36,7 @@ class Assignment(Path):
     # CMF Type Definition
     meta_type = 'ERP5 Assignment'
     portal_type = 'Assignment'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/BankAccount.py b/product/ERP5/Document/BankAccount.py
index d3b1af6981..a6b0e8169f 100755
--- a/product/ERP5/Document/BankAccount.py
+++ b/product/ERP5/Document/BankAccount.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -50,7 +50,7 @@ class BankAccount(Coordinate, Base):
 
     meta_type = 'ERP5 BankAccount'
     portal_type = 'BankAccount'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Binder.py b/product/ERP5/Document/Binder.py
index 0fd71e923b..c698e10374 100755
--- a/product/ERP5/Document/Binder.py
+++ b/product/ERP5/Document/Binder.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#          Jean-Paul Smets-Solane <jp@nexedi.com>
+#          Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/BusinessTemplate.py b/product/ERP5/Document/BusinessTemplate.py
index 545a37ba62..b2ebaa72ea 100755
--- a/product/ERP5/Document/BusinessTemplate.py
+++ b/product/ERP5/Document/BusinessTemplate.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -254,7 +254,7 @@ class BusinessTemplate(XMLObject):
 
     meta_type = 'ERP5 Business Template'
     portal_type = 'Business Template'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Capacity.py b/product/ERP5/Document/Capacity.py
index 42ae793478..5c8fe4f39b 100755
--- a/product/ERP5/Document/Capacity.py
+++ b/product/ERP5/Document/Capacity.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/ComplementPredicate.py b/product/ERP5/Document/ComplementPredicate.py
index 93ada65f9f..aa53646d1c 100755
--- a/product/ERP5/Document/ComplementPredicate.py
+++ b/product/ERP5/Document/ComplementPredicate.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -40,7 +40,7 @@ class ComplementPredicate(Base, Predicate):
   """
   meta_type = 'ERP5 Complement Predicate'
   portal_type = 'Complement Predicate'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/ERP5/Document/Container.py b/product/ERP5/Document/Container.py
index d3af58b34a..f16f8fa93a 100755
--- a/product/ERP5/Document/Container.py
+++ b/product/ERP5/Document/Container.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -51,7 +51,7 @@ class Container(Movement, XMLObject):
 
     meta_type = 'ERP5 Container'
     portal_type = 'Container'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/ContainerCell.py b/product/ERP5/Document/ContainerCell.py
index 521d453f54..7eafd7983b 100755
--- a/product/ERP5/Document/ContainerCell.py
+++ b/product/ERP5/Document/ContainerCell.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -44,7 +44,7 @@ class ContainerCell(DeliveryCell):
 
     meta_type = 'ERP5 Container Cell'
     portal_type = 'Container Cell'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
     isCell = 1
diff --git a/product/ERP5/Document/ContainerLine.py b/product/ERP5/Document/ContainerLine.py
index eed9516a2e..4bace64e74 100755
--- a/product/ERP5/Document/ContainerLine.py
+++ b/product/ERP5/Document/ContainerLine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -48,7 +48,7 @@ class ContainerLine(DeliveryLine):
 
     meta_type = 'ERP5 Container Line'
     portal_type = 'Container Line'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Coordinate.py b/product/ERP5/Document/Coordinate.py
index 0091efdacd..58f4ff7a02 100755
--- a/product/ERP5/Document/Coordinate.py
+++ b/product/ERP5/Document/Coordinate.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/DeliveryCell.py b/product/ERP5/Document/DeliveryCell.py
index 64d6eaf14c..8fded75deb 100755
--- a/product/ERP5/Document/DeliveryCell.py
+++ b/product/ERP5/Document/DeliveryCell.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -48,7 +48,7 @@ class DeliveryCell(SetMappedValue, Movement):
 
     meta_type = 'ERP5 Delivery Cell'
     portal_type = 'Delivery Cell'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
     isCell = 1
diff --git a/product/ERP5/Document/DependentCapacity.py b/product/ERP5/Document/DependentCapacity.py
index 49279f0b2b..ae689cc5bd 100755
--- a/product/ERP5/Document/DependentCapacity.py
+++ b/product/ERP5/Document/DependentCapacity.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -40,7 +40,7 @@ class DependentCapacity(Capacity):
 
     meta_type = 'ERP5 Dependent Capacity'
     portal_type = 'Dependent Capacity'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Device.py b/product/ERP5/Document/Device.py
index c15fa7a5da..d4cab5f3a4 100755
--- a/product/ERP5/Document/Device.py
+++ b/product/ERP5/Document/Device.py
@@ -39,7 +39,7 @@ class Device(Item):
 
     meta_type = 'ERP5 Device'
     portal_type = 'Device'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Discount.py b/product/ERP5/Document/Discount.py
index 1259231cf7..8e83e8bc54 100755
--- a/product/ERP5/Document/Discount.py
+++ b/product/ERP5/Document/Discount.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -39,7 +39,7 @@ class Discount(XMLObject):
 
     meta_type = 'ERP5 Discount'
     portal_type = 'Discount'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Document.py b/product/ERP5/Document/Document.py
index 6821ebd910..8f8068a206 100755
--- a/product/ERP5/Document/Document.py
+++ b/product/ERP5/Document/Document.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/Domain.py b/product/ERP5/Document/Domain.py
index 1004e699b4..c088a40e6f 100755
--- a/product/ERP5/Document/Domain.py
+++ b/product/ERP5/Document/Domain.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -41,7 +41,7 @@ class Domain(PredicateGroup):
   """
   meta_type = 'ERP5 Domain'
   portal_type = 'Domain'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 0
   isRADContent = 0
 
diff --git a/product/ERP5/Document/Event.py b/product/ERP5/Document/Event.py
index 5e5c7fe4d2..89712c19cb 100755
--- a/product/ERP5/Document/Event.py
+++ b/product/ERP5/Document/Event.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/File.py b/product/ERP5/Document/File.py
index 569339918f..9485646a69 100755
--- a/product/ERP5/Document/File.py
+++ b/product/ERP5/Document/File.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/GeographicAddress.py b/product/ERP5/Document/GeographicAddress.py
index 8784c9a85c..5671de915e 100755
--- a/product/ERP5/Document/GeographicAddress.py
+++ b/product/ERP5/Document/GeographicAddress.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -49,7 +49,7 @@ class GeographicAddress(Coordinate, Base):
     """
     meta_type = 'ERP5 Geographic Address'
     portal_type = 'Address'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Image.py b/product/ERP5/Document/Image.py
index 551b3b18ba..90041569c3 100755
--- a/product/ERP5/Document/Image.py
+++ b/product/ERP5/Document/Image.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/IndependentCapacity.py b/product/ERP5/Document/IndependentCapacity.py
index b201449b1e..9ec24467f7 100755
--- a/product/ERP5/Document/IndependentCapacity.py
+++ b/product/ERP5/Document/IndependentCapacity.py
@@ -40,7 +40,7 @@ class IndependentCapacity(Capacity):
 
     meta_type = 'ERP5 Independent Capacity'
     portal_type = 'Independent Capacity'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Inventory.py b/product/ERP5/Document/Inventory.py
index 76ebac3d72..2af240f02d 100755
--- a/product/ERP5/Document/Inventory.py
+++ b/product/ERP5/Document/Inventory.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/Invoice.py b/product/ERP5/Document/Invoice.py
index ea9ac3d523..8285623b77 100755
--- a/product/ERP5/Document/Invoice.py
+++ b/product/ERP5/Document/Invoice.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -35,7 +35,7 @@ class Invoice(AccountingTransaction):
     # CMF Type Definition
     meta_type = 'ERP5 Invoice'
     portal_type = 'Invoice'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/InvoiceCell.py b/product/ERP5/Document/InvoiceCell.py
index 14fd662ba4..17b777cfa9 100755
--- a/product/ERP5/Document/InvoiceCell.py
+++ b/product/ERP5/Document/InvoiceCell.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -44,7 +44,7 @@ class InvoiceCell(DeliveryCell):
 
     meta_type = 'ERP5 Invoice Cell'
     portal_type = 'Invoice Cell'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
     isCell = 1
diff --git a/product/ERP5/Document/InvoiceLine.py b/product/ERP5/Document/InvoiceLine.py
index 08eba099a0..88559cea72 100755
--- a/product/ERP5/Document/InvoiceLine.py
+++ b/product/ERP5/Document/InvoiceLine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -48,7 +48,7 @@ class InvoiceLine(DeliveryLine):
 
     meta_type = 'ERP5 Invoice Line'
     portal_type = 'Invoice Line'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Item.py b/product/ERP5/Document/Item.py
index d3dfce4d33..e19576389d 100755
--- a/product/ERP5/Document/Item.py
+++ b/product/ERP5/Document/Item.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -40,7 +40,7 @@ class Item(XMLObject, Amount):
 
     meta_type = 'ERP5 Item'
     portal_type = 'Item'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Machine.py b/product/ERP5/Document/Machine.py
index bd314e7bb4..e4ebf4ca97 100755
--- a/product/ERP5/Document/Machine.py
+++ b/product/ERP5/Document/Machine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -30,6 +30,6 @@ from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 
 class Machine:
 
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
 
     pass
diff --git a/product/ERP5/Document/MailMessage.py b/product/ERP5/Document/MailMessage.py
index 2cfd40dfcd..1b0e789bbc 100755
--- a/product/ERP5/Document/MailMessage.py
+++ b/product/ERP5/Document/MailMessage.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -46,7 +46,7 @@ class MailMessage(XMLObject, Event, MailMessage):
 
     meta_type = 'ERP5 Mail Message'
     portal_type = 'Mail Message'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/MappedValue.py b/product/ERP5/Document/MappedValue.py
index fc114290e7..080fff8efe 100755
--- a/product/ERP5/Document/MappedValue.py
+++ b/product/ERP5/Document/MappedValue.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -52,7 +52,7 @@ class MappedValue(Domain, Amount):
   """
   meta_type = 'ERP5 Mapped Value'
   portal_type = 'Mapped Value'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/ERP5/Document/MetaNode.py b/product/ERP5/Document/MetaNode.py
index 860674a43a..8649d356c0 100755
--- a/product/ERP5/Document/MetaNode.py
+++ b/product/ERP5/Document/MetaNode.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -41,7 +41,7 @@ class MetaNode(Node, CoreMetaNode):
 
     meta_type = 'ERP5 MetaNode'
     portal_type = 'MetaNode'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/MetaResource.py b/product/ERP5/Document/MetaResource.py
index c6858d6e38..61c4b0bb67 100755
--- a/product/ERP5/Document/MetaResource.py
+++ b/product/ERP5/Document/MetaResource.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -39,7 +39,7 @@ class MetaResource(Resource, CoreMetaResource):
 
     meta_type = 'ERP5 MetaResource'
     portal_type = 'MetaResource'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Movement.py b/product/ERP5/Document/Movement.py
index a314de3d69..0e07eccd9f 100755
--- a/product/ERP5/Document/Movement.py
+++ b/product/ERP5/Document/Movement.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -188,7 +188,7 @@ class Movement(XMLObject, Amount):
   """
   meta_type = 'ERP5 Movement'
   portal_type = 'Movement'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
   isMovement = 1
@@ -424,4 +424,3 @@ a service in a public administration)."""
   security.declareProtected(Permissions.View, 'isSimulated')
   def isSimulated(self):
     return len(self.getDeliveryRelatedValueList()) > 0 or len(self.getOrderRelatedValueList()) > 0
-
diff --git a/product/ERP5/Document/MultivaluePredicate.py b/product/ERP5/Document/MultivaluePredicate.py
index 1ccd222e48..6c29548a18 100755
--- a/product/ERP5/Document/MultivaluePredicate.py
+++ b/product/ERP5/Document/MultivaluePredicate.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -40,7 +40,7 @@ class MultivaluePredicate(ValuePredicate):
   """
   meta_type = 'ERP5 Multivalue Predicate'
   portal_type = 'Multivalue Predicate'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/ERP5/Document/OrderLine.py b/product/ERP5/Document/OrderLine.py
index 97ff7188b3..669c9881ba 100755
--- a/product/ERP5/Document/OrderLine.py
+++ b/product/ERP5/Document/OrderLine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -45,7 +45,7 @@ class OrderLine(DeliveryLine):
 
     meta_type = 'ERP5 Order Line'
     portal_type = 'Order Line'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Organisation.py b/product/ERP5/Document/Organisation.py
index 7dd6ea0337..2974903c99 100755
--- a/product/ERP5/Document/Organisation.py
+++ b/product/ERP5/Document/Organisation.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -52,7 +52,7 @@ class Organisation(Entity, MetaNode, XMLObject):
 
     meta_type = 'ERP5 Organisation'
     portal_type = 'Organisation'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/PackingList.py b/product/ERP5/Document/PackingList.py
index e2b74fed5b..5993219faa 100755
--- a/product/ERP5/Document/PackingList.py
+++ b/product/ERP5/Document/PackingList.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -61,7 +61,7 @@ class PackingList(Delivery):
     # CMF Type Definition
     meta_type = 'ERP5 Packing List'
     portal_type = 'Packing List'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Path.py b/product/ERP5/Document/Path.py
index 7ba6017b53..5f2af99465 100755
--- a/product/ERP5/Document/Path.py
+++ b/product/ERP5/Document/Path.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -49,7 +49,7 @@ class Path(MappedValue):
   """
   meta_type = 'ERP5 Path'
   portal_type = 'Path'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/ERP5/Document/PaySheet.py b/product/ERP5/Document/PaySheet.py
index e60fe6dba2..8d354f9cde 100755
--- a/product/ERP5/Document/PaySheet.py
+++ b/product/ERP5/Document/PaySheet.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -37,7 +37,7 @@ class PaySheet(XMLObject):
 
     meta_type = 'ERP5 Pay Sheet'
     portal_type = 'Pay Sheet'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/PaymentCondition.py b/product/ERP5/Document/PaymentCondition.py
index 945d32462e..60dfb616c4 100755
--- a/product/ERP5/Document/PaymentCondition.py
+++ b/product/ERP5/Document/PaymentCondition.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -39,7 +39,7 @@ class PaymentCondition(XMLObject):
 
     meta_type = 'ERP5 Payment Condition'
     portal_type = 'Payment Condition'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Person.py b/product/ERP5/Document/Person.py
index 0c75c1eaaf..e21a5a0727 100755
--- a/product/ERP5/Document/Person.py
+++ b/product/ERP5/Document/Person.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -54,7 +54,7 @@ class Person(Entity, Node, XMLObject):
 
     meta_type = 'ERP5 Person'
     portal_type = 'Person'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Predicate.py b/product/ERP5/Document/Predicate.py
index c9670df1f6..0f1bdb452d 100755
--- a/product/ERP5/Document/Predicate.py
+++ b/product/ERP5/Document/Predicate.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/PredicateGroup.py b/product/ERP5/Document/PredicateGroup.py
index c2dcc1fd41..250e35aa5d 100755
--- a/product/ERP5/Document/PredicateGroup.py
+++ b/product/ERP5/Document/PredicateGroup.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -40,7 +40,7 @@ class PredicateGroup(Folder, Predicate):
   """
   meta_type = 'ERP5 Predicate Group'
   portal_type = 'Predicate Group'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/ERP5/Document/Pricing.py b/product/ERP5/Document/Pricing.py
index af50fc8cc6..50b1df477c 100755
--- a/product/ERP5/Document/Pricing.py
+++ b/product/ERP5/Document/Pricing.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -43,7 +43,7 @@ class Pricing(MappedValue, XMLMatrix):
 
     meta_type = 'ERP5 Pricing'
     portal_type = 'Pricing'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/ProductionReport.py b/product/ERP5/Document/ProductionReport.py
index 64e7c6e266..4d41b46fcd 100755
--- a/product/ERP5/Document/ProductionReport.py
+++ b/product/ERP5/Document/ProductionReport.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -41,7 +41,7 @@ class ProductionReport(Delivery):
     # CMF Type Definition
     meta_type = 'ERP5 Production Report'
     portal_type = 'Production Report'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/ProductionReportCell.py b/product/ERP5/Document/ProductionReportCell.py
index fa60617f71..e5a8a93bd4 100755
--- a/product/ERP5/Document/ProductionReportCell.py
+++ b/product/ERP5/Document/ProductionReportCell.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,7 +42,7 @@ class ProductionReportCell(DeliveryCell):
 
     meta_type = 'ERP5 Production Report Cell'
     portal_type = 'Production Report Cell'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
     isMovement = 1
diff --git a/product/ERP5/Document/ProductionReportLine.py b/product/ERP5/Document/ProductionReportLine.py
index 7630d802e6..4522e442c1 100755
--- a/product/ERP5/Document/ProductionReportLine.py
+++ b/product/ERP5/Document/ProductionReportLine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -40,7 +40,7 @@ class ProductionReportLine(DeliveryLine):
 
   meta_type = 'ERP5 Production Report Line'
   portal_type = 'Production Report Line'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/ERP5/Document/Project.py b/product/ERP5/Document/Project.py
index 90277f6060..b389104283 100755
--- a/product/ERP5/Document/Project.py
+++ b/product/ERP5/Document/Project.py
@@ -43,7 +43,7 @@ class Project(Order):
 
     meta_type = 'ERP5 Project'
     portal_type = 'Project'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/ProjectReport.py b/product/ERP5/Document/ProjectReport.py
index e9af142904..92f77d63e2 100755
--- a/product/ERP5/Document/ProjectReport.py
+++ b/product/ERP5/Document/ProjectReport.py
@@ -47,7 +47,7 @@ class ProjectReport(Delivery):
 
     meta_type = 'ERP5 Project Report'
     portal_type = 'Project Report'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/ReportTopic.py b/product/ERP5/Document/ReportTopic.py
index b4a795acef..d25646f63d 100755
--- a/product/ERP5/Document/ReportTopic.py
+++ b/product/ERP5/Document/ReportTopic.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -44,7 +44,7 @@ class ReportTopic(Domain, MetaNode, MetaResource):
   """
   meta_type = 'ERP5 ReportTopic'
   portal_type = 'Report Topic'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/ERP5/Document/Resource.py b/product/ERP5/Document/Resource.py
index c89ae5c797..ee16b3e9cb 100755
--- a/product/ERP5/Document/Resource.py
+++ b/product/ERP5/Document/Resource.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -46,7 +46,7 @@ class Resource(XMLObject, CoreResource, Variated):
 
     meta_type = 'ERP5 Resource'
     portal_type = 'Resource'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Rule.py b/product/ERP5/Document/Rule.py
index 29dbbc3164..5d6e2782c1 100755
--- a/product/ERP5/Document/Rule.py
+++ b/product/ERP5/Document/Rule.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -64,7 +64,7 @@ class Rule(XMLObject, Predicate):
     # CMF Type Definition
     meta_type = 'ERP5 Rule'
     portal_type = 'Rule'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/SaleOpportunity.py b/product/ERP5/Document/SaleOpportunity.py
index 9f419bfa02..939e304d26 100755
--- a/product/ERP5/Document/SaleOpportunity.py
+++ b/product/ERP5/Document/SaleOpportunity.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -48,7 +48,7 @@ class SaleOpportunity(MetaNode, XMLObject):
 
     meta_type = 'ERP5 Sale Opportunity'
     portal_type = 'Sale Opportunity'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Segment.py b/product/ERP5/Document/Segment.py
index cb82a79b6c..d10b178ad6 100755
--- a/product/ERP5/Document/Segment.py
+++ b/product/ERP5/Document/Segment.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -45,7 +45,7 @@ class Segment(Domain, MetaNode, MetaResource):
   """
   meta_type = 'ERP5 Segment'
   portal_type = 'Segment'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/ERP5/Document/SetMappedValue.py b/product/ERP5/Document/SetMappedValue.py
index 074ac76a2d..f2abb8dcd0 100755
--- a/product/ERP5/Document/SetMappedValue.py
+++ b/product/ERP5/Document/SetMappedValue.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,7 +42,7 @@ class SetMappedValue(MappedValue, SetPredicate):
   """
   meta_type = 'ERP5 Set Mapped Value'
   portal_type = 'Set Mapped Value'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/ERP5/Document/SetPredicate.py b/product/ERP5/Document/SetPredicate.py
index 2e06c8e056..9020204dba 100755
--- a/product/ERP5/Document/SetPredicate.py
+++ b/product/ERP5/Document/SetPredicate.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,7 +42,7 @@ class SetPredicate(ValuePredicate):
   """
   meta_type = 'ERP5 Set Predicate'
   portal_type = 'Set Predicate'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/ERP5/Document/SetPricing.py b/product/ERP5/Document/SetPricing.py
index 4b7ce1b5fb..2a0a94745f 100755
--- a/product/ERP5/Document/SetPricing.py
+++ b/product/ERP5/Document/SetPricing.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -43,7 +43,7 @@ class SetPricing(SetMappedValue, XMLMatrix):
 
     meta_type = 'ERP5 Set Pricing'
     portal_type = 'Set Pricing'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Supply.py b/product/ERP5/Document/Supply.py
index 5d5eb0982f..f71a551b6e 100755
--- a/product/ERP5/Document/Supply.py
+++ b/product/ERP5/Document/Supply.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/SupplyCell.py b/product/ERP5/Document/SupplyCell.py
index 1d9dc98035..24b0856a49 100755
--- a/product/ERP5/Document/SupplyCell.py
+++ b/product/ERP5/Document/SupplyCell.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -45,7 +45,7 @@ class SupplyCell(DeliveryCell, Path):
 
     meta_type = 'ERP5 Supply Cell'
     portal_type = 'Supply Cell'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/SupplyLine.py b/product/ERP5/Document/SupplyLine.py
index 4097a1ee39..88087ddb05 100755
--- a/product/ERP5/Document/SupplyLine.py
+++ b/product/ERP5/Document/SupplyLine.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -46,7 +46,7 @@ class SupplyLine(DeliveryLine, Path):
 
     meta_type = 'ERP5 Supply Line'
     portal_type = 'Supply Line'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Telephone.py b/product/ERP5/Document/Telephone.py
index 714e3d8ddf..ac4fcd357a 100755
--- a/product/ERP5/Document/Telephone.py
+++ b/product/ERP5/Document/Telephone.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -53,7 +53,7 @@ class Telephone(Coordinate, Base):
 
     meta_type = 'ERP5 Telephone'
     portal_type = 'Telephone'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/TradeCondition.py b/product/ERP5/Document/TradeCondition.py
index 913aca7f96..b996f96ed8 100755
--- a/product/ERP5/Document/TradeCondition.py
+++ b/product/ERP5/Document/TradeCondition.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,7 +42,7 @@ class TradeCondition(Order):
 
     meta_type = 'ERP5 Trade Condition'
     portal_type = 'Trade Condition'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Transaction.py b/product/ERP5/Document/Transaction.py
index b53f6cc503..30e4fdb9e8 100755
--- a/product/ERP5/Document/Transaction.py
+++ b/product/ERP5/Document/Transaction.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -41,7 +41,7 @@ class Transaction(Delivery):
     # CMF Type Definition
     meta_type = 'ERP5 Transaction'
     portal_type = 'Transaction'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Transformation.py b/product/ERP5/Document/Transformation.py
index d5ee9d0983..213d53b808 100755
--- a/product/ERP5/Document/Transformation.py
+++ b/product/ERP5/Document/Transformation.py
@@ -64,7 +64,7 @@ class Transformation(XMLObject, Domain, Variated):
 
     meta_type = 'ERP5 Transformation'
     portal_type = 'Transformation'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/TransformedResource.py b/product/ERP5/Document/TransformedResource.py
index 73cd35d2f3..19c4b47a19 100755
--- a/product/ERP5/Document/TransformedResource.py
+++ b/product/ERP5/Document/TransformedResource.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -105,7 +105,7 @@ class TransformedResource(XMLObject, XMLMatrix, Amount):
 
     meta_type = 'ERP5 Transformed Resource'
     portal_type = 'Transformed Resource'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Url.py b/product/ERP5/Document/Url.py
index db89c374d9..d91326463a 100755
--- a/product/ERP5/Document/Url.py
+++ b/product/ERP5/Document/Url.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
diff --git a/product/ERP5/Document/ValuePredicate.py b/product/ERP5/Document/ValuePredicate.py
index e1b8b2363b..00125167cf 100755
--- a/product/ERP5/Document/ValuePredicate.py
+++ b/product/ERP5/Document/ValuePredicate.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -40,7 +40,7 @@ class ValuePredicate(Base, Predicate):
   """
   meta_type = 'ERP5 Value Predicate'
   portal_type = 'Value Predicate'
-  add_permission = Permissions.AddERP5Content
+  add_permission = Permissions.AddPortalContent
   isPortalContent = 1
   isRADContent = 1
 
diff --git a/product/ERP5/Document/VariatedProperty.py b/product/ERP5/Document/VariatedProperty.py
index 44b84e39ed..a113d86a4e 100755
--- a/product/ERP5/Document/VariatedProperty.py
+++ b/product/ERP5/Document/VariatedProperty.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -48,7 +48,7 @@ class VariatedProperty(XMLObject, XMLMatrix, Variated):
 
     meta_type = 'ERP5 Variated Property'
     portal_type = 'Variated Property'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/Variation.py b/product/ERP5/Document/Variation.py
index 0efc4714be..8b550e97a2 100755
--- a/product/ERP5/Document/Variation.py
+++ b/product/ERP5/Document/Variation.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -40,7 +40,7 @@ class Variation(XMLObject, Variation):
 
     meta_type = 'ERP5 Variation'
     portal_type = 'Variation'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/VariationRange.py b/product/ERP5/Document/VariationRange.py
index 22b1ad47ca..b43226ca28 100755
--- a/product/ERP5/Document/VariationRange.py
+++ b/product/ERP5/Document/VariationRange.py
@@ -1,7 +1,7 @@
 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -40,7 +40,7 @@ class VariationRange(XMLObject, Core.Variation):
 
     meta_type = 'ERP5 VariationRange'
     portal_type = 'VariationRange'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
diff --git a/product/ERP5/Document/ZeroStockRule.py b/product/ERP5/Document/ZeroStockRule.py
index 8d42d351e1..865feb0b36 100755
--- a/product/ERP5/Document/ZeroStockRule.py
+++ b/product/ERP5/Document/ZeroStockRule.py
@@ -46,7 +46,7 @@ class ZeroStockRule(Rule):
     # CMF Type Definition
     meta_type = 'ERP5 Zero Stock Rule'
     portal_type = 'Zero Stock Rule'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 
-- 
2.30.9