fixed Solanes typo

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@430 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/Base18/Base18.py

@@ -4,7 +4,7 @@
 #         documents.
 #
 # 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

product/Base18/CookieCrumbler.py

@@ -5,7 +5,7 @@
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 # 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

product/Base18/Document.py

@@ -4,7 +4,7 @@
 #         documents.
 #
 # 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

product/Base18/Extensions/MigrateContent.py

@@ -5,7 +5,7 @@
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 # 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

product/Base18/Folder.py

 ##############################################################################
 #
 # 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

product/Base18/MembershipTool.py

@@ -5,7 +5,7 @@
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 # 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

product/Base18/NewsItem.py

@@ -4,7 +4,7 @@
 #         documents.
 #
 # 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

product/Base18/Replica.py

@@ -5,7 +5,7 @@
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 # 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

product/Base18/Translation.py

@@ -4,7 +4,7 @@
 #         documents.
 #
 # 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 

product/Base18/TranslationTool.py

@@ -4,7 +4,7 @@
 #         documents.
 #
 # 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 

product/Base18/Wiki.py

@@ -4,7 +4,7 @@
 #         documents.
 #
 # 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

product/Base18/__init__.py

@@ -4,7 +4,7 @@
 #         documents.
 #
 # 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 

product/Base18/interfaces/Translatable.py

@@ -4,7 +4,7 @@
 #         documents.
 #
 # 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

product/Base18/interfaces/__init__.py

@@ -4,7 +4,7 @@
 #         documents.
 #
 # 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 

product/Base18/skins/content18/TranslatedBody.py

@@ -13,7 +13,7 @@
 #         documents.
 #
 # 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

product/Base18/skins/content18/TranslatedDescription.py

@@ -13,7 +13,7 @@
 #         documents.
 #
 # 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

product/Base18/skins/content18/TranslatedTitle.py

@@ -13,7 +13,7 @@
 #         documents.
 #
 # 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

product/Base18/skins/content18/TranslatedTitle_or_id.py

@@ -13,7 +13,7 @@
 #         documents.
 #
 # 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

product/Base18/skins/content18/translation_edit.py

@@ -13,7 +13,7 @@
 #         documents.
 #
 # 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

product/Base18/skins/content18/translation_status_modify.py

@@ -13,7 +13,7 @@
 #         documents.
 #
 # 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

product/Base18/skins/nexedi/combined_subjects.py

@@ -10,7 +10,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>
 #
 # This program is Free Software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

product/Base18/skins/nexedi/public_subtopics.py

@@ -2,7 +2,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>
 #
 # This program is Free Software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

product/Base18/utils.py

@@ -5,7 +5,7 @@
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 # 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

product/CMFActivity/ActiveProcess.py

 ##############################################################################
 #
 # 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

product/CMFActivity/ActivityTool.py

 ##############################################################################
 #
 # 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
@@ -82,6 +82,8 @@ class Message:
       LOG('WARNING ActivityTool', 0,
            'Trying to call method %s on object %s' % (self.method_id, self.object_path))
       object = activity_tool.unrestrictedTraverse(self.object_path)
+      # Change user if required (TO BE DONE)
+      # self.activity_kw
       REQUEST = get_request()
       REQUEST.active_process = self.active_process
       result = getattr(object, self.method_id)(*self.args, **self.kw)

product/CMFActivity/__init__.py

 ##############################################################################
 #
 # 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

product/CMFCategory/Category.py

 ##############################################################################
 #
 # 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

product/CMFCategory/CategoryTool.py

 ##############################################################################
 #
 # 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

product/CMFCategory/PropertySheet/.cvsignore

+__init__.py
 .AppleDouble
 *.pyc

product/CMFCategory/PropertySheet/BaseCategory.py

 ##############################################################################
 #
 # 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

product/CMFCategory/PropertySheet/CategoryCore.py

 ##############################################################################
 #
 # 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

product/CMFCategory/PropertySheet/__init__.py

-from BaseCategory import BaseCategory
-from CategoryCore import CategoryCore
+from CategoryCore import CategoryCore
+from BaseCategory import BaseCategory
\ No newline at end of file

product/CMFCategory/__init__.py

 ##############################################################################
 #
 # 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

product/Coramy/__init__.py

 ##############################################################################
 #
 # 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

product/ERP5/ERP5Globals.py

 ##############################################################################
 #
 # 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
@@ -164,3 +164,4 @@ future_inventory_state_list = ('planned', 'ordered',)
 column_base_category_list = ('taille', )
 line_base_category_list = ('coloris', 'couleur', )
 tab_base_category_list = ('morphologie', )
+

product/ERP5/Interface/Coordinate.py

 ##############################################################################
 #
 # 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

product/ERP5/Interface/Entity.py

 ##############################################################################
 #
 # 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

product/ERP5/Interface/Predicate.py

 ##############################################################################
 #
 # 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

product/ERP5/NotUsed.py

 ##############################################################################
 #
 # Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-#                    Jean-Paul Smets-Solane <jp@nexedi.com>
+#                    Jean-Paul Smets-Solanes <jp@nexedi.com>
 #                    Sebastien Robin <seb@nexedi.com>
 #
 # WARNING: This program as such is intended to be used by professional

product/ERP5/PropertySheet/Account.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/AppliedRule.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/BankAccount.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/BusinessTemplate.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Container.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/CopyrightTax.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Delivery.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Document.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Domain.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/EcoTax.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/FlowCapacity.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/GeographicAddress.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Inventory.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/InventoryLine.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Item.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/ItemAggregation.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/MailMessage.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/MappedValue.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Movement.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Organisation.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Path.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/PaySheet.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Person.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Predicate.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Price.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Reference.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Resource.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/SaleOpportunity.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Simulation.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/StockCapacity.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Telephone.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Transformation.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/Url.py

 ##############################################################################
 #
 # 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

product/ERP5/PropertySheet/VariationRange.py

 ##############################################################################
 #
 # 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

product/ERP5/Tool/ActivityTool.py

 ##############################################################################
 #
 # 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

product/ERP5/Tool/Category.py

 ##############################################################################
 #
 # 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

product/ERP5/Tool/CategoryTool.py

 ##############################################################################
 #
 # 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

product/ERP5/Tool/InterpolationTool.py

 ##############################################################################
 #
 # 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

product/ERP5/Tool/RuleTool.py

 ##############################################################################
 #
 # 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

product/ERP5/Tool/TemplateTool.py

 ##############################################################################
 #
 # 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

product/ERP5/Variated.py

 ##############################################################################
 #
 # 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

product/ERP5/VariationValue.py

 ##############################################################################
 #
 # 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

product/ERP5/__init__.py

 ##############################################################################
 #
 # 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

product/ERP5Catalog/CatalogTool.py

 ##############################################################################
 #
 # 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
@@ -85,6 +85,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool):
 
     manage_options = ( { 'label' : 'Overview', 'action' : 'manage_overview' },
                        { 'label' : 'Filter', 'action' : 'manage_filter' },
+                       { 'label' : 'Schema', 'action' : 'manage_schema' },
                      ) + ZCatalog.manage_options
 
 
@@ -100,6 +101,78 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool):
                 , 'manage_filter' )
     manage_filter = DTMLFile( 'dtml/manageFilter', globals() )
 
+    security.declareProtected( CMFCorePermissions.ManagePortal
+                , 'manage_schema' )
+    manage_schema = DTMLFile( 'dtml/manageSchema', globals() )
+
+
+    # Schema Management
+    def editColumn(self, column_id, sql_definition, method_id, default_value, REQUEST=None, RESPONSE=None):
+      """
+        Modifies a schema column of the catalog
+      """
+      new_schema = []
+      for c in self.getIndexList():
+        if c.id == index_id:
+          new_c = {'id': index_id, 'sql_definition': sql_definition, 'method_id': method_id, 'default_value': default_value}
+        else:
+          new_c = c
+        new_schema.append(new_c)
+      self.setColumnList(new_schema)
+
+    def setColumnList(self, column_list):
+      """
+      """
+      self._sql_schema = column_list
+
+    def getColumnList(self):
+      """
+      """
+      if not hasattr(self, '_sql_schema'): self._sql_schema = []
+      return self._sql_schema
+
+    def getColumn(self, column_id):
+      """
+      """
+      for c in self.getColumnList():
+        if c.id == column_id:
+          return c
+      return None
+
+    def editIndex(self, index_id, sql_definition, REQUEST=None, RESPONSE=None):
+      """
+        Modifies the schema of the catalog
+      """
+      new_index = []
+      for c in self.getIndexList():
+        if c.id == index_id:
+          new_c = {'id': index_id, 'sql_definition': sql_definition}
+        else:
+          new_c = c
+        new_index.append(new_c)
+      self.setIndexList(new_index)
+
+    def setIndexList(self, index_list):
+      """
+      """
+      self._sql_index = index_list
+
+    def getIndexList(self):
+      """
+      """
+      if not hasattr(self, '_sql_index'): self._sql_index = []
+      return self._sql_index
+
+    def getIndex(self, index_id):
+      """
+      """
+      for c in self.getIndexList():
+        if c.id == index_id:
+          return c
+      return None
+
+
+    # Filtering
     def editFilter(self, REQUEST=None, RESPONSE=None):
       """
       This methods allows to set a filter on each zsql method called,
@@ -291,7 +364,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool):
 
         return apply(ZCatalog.countResults, (self, REQUEST), kw)
 
-    def catalog_object(self, object, uid, idxs=[]):
+    def catalog_object(self, object, uid, idxs=[], is_object_moved=0):
         wf = getToolByName(self, 'portal_workflow')
         if wf is not None:
             vars = wf.getCatalogVariablesFor(object)
@@ -299,7 +372,7 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool):
             vars = {}
         w = IndexableObjectWrapper(vars, object)
         #try:
-        ZCatalog.catalog_object(self, w, uid, idxs)
+        ZCatalog.catalog_object(self, w, uid, idxs=idxs, is_object_moved=is_object_moved)
         #except:
           # When we import data into Zope
           # the ZSQLCatalog does not work currently
@@ -328,6 +401,16 @@ class CatalogTool (UniqueObject, ZCatalog, CMFCoreCatalogTool):
           url = path
         self.uncatalog_object(url)
 
+    security.declarePrivate('moveObject')
+    def moveObject(self, object, idxs=[]):
+        """
+          Reindex in catalog, taking into account
+          peculiarities of ERP5Catalog / ZSQLCatalog
+
+          Useless ??? XXX
+        """
+        url = self.__url(object)
+        self.catalog_object(object, url, idxs=idxs, is_object_moved=1)
 
 
 InitializeClass(CatalogTool)

product/ERP5Catalog/__init__.py

 ##############################################################################
 #
 # 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

product/ERP5Form/Form.py

 ##############################################################################
 #
 # 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

product/ERP5Form/ImageField.py

 ##############################################################################
 #
 # 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

product/ERP5Form/ListBox.py

 ##############################################################################
 #
 # 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

product/ERP5Form/MatrixBox.py

 ##############################################################################
 #
 # 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

product/ERP5Form/MultiRelationField.py

 ##############################################################################
 #
 # 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

product/ERP5Form/PDFTemplate.py

 ##############################################################################
 #
 # 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

product/ERP5Form/RelationField.py

 ##############################################################################
 #
 # 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

product/ERP5Form/Selection.py

 ##############################################################################
 #
 # 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
@@ -132,6 +132,7 @@ class Selection(Acquisition.Implicit, Traversable, Persistent):
           else:
             return []
         else:
+          # We sould try to allow more filtering
           return context.portal_catalog(uid = self.selection_uids)
 
     def __getitem__(self, index, REQUEST=None):

product/ERP5Form/SelectionTool.py

 ##############################################################################
 #
 # 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

product/ERP5Form/__init__.py

 ##############################################################################
 #
 # 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

product/ERP5Shop/Document/ShopOrder.py

@@ -96,7 +96,7 @@ class ShopOrder(MMMShopOrder, Order):
     """
     meta_type = 'ERP5 Shop Order'
     portal_type = 'Shop Order'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 

product/ERP5Shop/Document/ShopProduct.py

 ##############################################################################
 #
 # 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 ShopProduct(MMMShopProduct, Resource, XMLMatrix):
 
     meta_type = 'ERP5 Shop Product'
     portal_type = 'Shop Product'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 

product/ERP5Shop/Document/ShoppingCart.py

 ##############################################################################
 #
 # 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

product/ERP5Shop/Interface/ShopOrder.py

 ##############################################################################
 #
 # 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

product/ERP5Shop/Interface/ShopProduct.py

 ##############################################################################
 #
 # 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

product/ERP5Shop/Interface/ShoppingCart.py

 ##############################################################################
 #
 # 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

product/ERP5Shop/PropertySheet/ShopOrder.py

 ##############################################################################
 #
 # 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

product/ERP5Shop/PropertySheet/ShopProduct.py

 ##############################################################################
 #
 # 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

product/ERP5Shop/__init__.py

 ##############################################################################
 #
 # 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

product/ERP5SyncML/__init__.py

 ##############################################################################
 #
 # 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

product/ERP5Type/Context.py

 ##############################################################################
 #
 # 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

product/ERP5Type/Document/Folder.py

 ##############################################################################
 #
 # 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
@@ -447,8 +447,8 @@ be a problem)."""
         Applies immediateReindexObject recursively
       """
       # Reindex self
-      self.flushActivity(invoke = 0, method_id='immediateReindexObject')
-      self.flushActivity(invoke = 0, method_id='recursiveImmediateReindexObject')
+      self.flushActivity(invoke = 0, method_id='immediateReindexObject') # This might create a recursive lock
+      self.flushActivity(invoke = 0, method_id='recursiveImmediateReindexObject') # This might create a recursive lock
       if self.isIndexable:
         self.immediateReindexObject()
       # Reindex contents

product/ERP5Type/ERP5Type.py

 ##############################################################################
 #
 # 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

product/ERP5Type/Permissions.py

 ##############################################################################
 #
 # 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
@@ -130,6 +130,7 @@ setDefaultRoles(TranslateContent, ('Manager', 'Owner', 'Member'))
 #
 # - using technical types / interfaces (ie. Entity, Coordinate, Predicate, etc.)
 
-AddERP5Content = 'Add ERP5 content'
-setDefaultRoles(AddERP5Content, ('Manager', ))
+#AddERP5Content = 'Add ERP5 content'
+#setDefaultRoles(AddERP5Content, ('Manager', ))
+AddERP5Content = AddPortalContent # Since we put come CPS content in ERP5 documents, there is no rationale in having 2 permissions
 

product/ERP5Type/PropertySheet/Base.py

 ##############################################################################
 #
 # 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

product/ERP5Type/PropertySheet/DublinCore.py

 ##############################################################################
 #
 # 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

product/ERP5Type/PropertySheet/Folder.py

 ##############################################################################
 #
 # 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

product/ERP5Type/PropertySheet/SimpleItem.py

 ##############################################################################
 #
 # 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

product/ERP5Type/PropertySheet/XMLObject.py

 ##############################################################################
 #
 # 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

product/ERP5Type/Tool/ClassTool.py

 ##############################################################################
 #
 # 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

product/ERP5Type/Utils.py

 ##############################################################################
 #
 # 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
@@ -336,7 +336,7 @@ def importLocalDocument(class_id):
   if not hasattr(document_class, 'isRADContent'):
     document_class.isRADContent = 1
   if not hasattr(document_class, 'add_permission'):
-    document_class.add_permission = Permissions.AddERP5Content
+    document_class.add_permission = Permissions.AddPortalContent
   if not hasattr(document_class, '__implements__'):
     document_class.__implements__ = ()
   initializeDefaultProperties([document_class])

product/ERP5Type/Utils2.py

@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 # 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

product/ERP5Type/XMLMatrix.py

 ##############################################################################
 #
 # 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

product/ERP5Type/XMLObject.py

 ##############################################################################
 #
 # 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

product/ERP5Type/ZopePatch.py

@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 # 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

product/ERP5Type/__init__.py

 ##############################################################################
 #
 # 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

product/Nexedi/Document/NetworkProduct.py

@@ -38,7 +38,7 @@ class NetworkProduct( ShopProduct, Document18 ):
     meta_type='Nexedi Service Product'
     portal_type='Service Product'
     effective_date = expiration_date = None
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 

product/Nexedi/Document/NexediServicePricing.py

 ##############################################################################
 #
 # 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 NexediServicePricing(SetPricing):
 
     meta_type = 'Nexedi Service Pricing'
     portal_type = 'Pricing'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 

product/Nexedi/Document/WPNNode.py

 ##############################################################################
 #
 # 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 WPNNode(Item):
 
     meta_type = 'Nexedi WPN Node'
     portal_type = 'WPN Node'
-    add_permission = Permissions.AddERP5Content
+    add_permission = Permissions.AddPortalContent
     isPortalContent = 1
     isRADContent = 1
 

product/Nexedi/PropertySheet/NetworkProduct.py

 ##############################################################################
 #
 # 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

product/Nexedi/PropertySheet/WPNNode.py

 ##############################################################################
 #
 # 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

product/ZSQLCatalog/SQLCatalog.py

@@ -97,19 +97,60 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
 
   def getColumnIds(self):
     """
-    Calls the show column meythod and returns dictionnary of
+    Calls the show column method and returns dictionnary of
+    Field Ids
+    """
+    method_name = self.sql_catalog_schema
+    keys = {}
+    for table in self.getCatalogSearchTableIds():
+      try:
+        method = getattr(self,  method_name)
+        search_result = method(table=table)
+        for c in search_result:
+          keys[c.Field] = 1
+      except:
+        pass
+    keys = keys.keys()
+    keys.sort()
+    return keys
+
+  def getResultColumnIds(self):
+    """
+    Calls the show column method and returns dictionnary of
+    Field Ids
+    """
+    method_name = self.sql_catalog_schema
+    keys = {}
+    for table in self.getCatalogSearchTableIds():
+      try:
+        method = getattr(self,  method_name)
+        search_result = method(table=table)
+        for c in search_result:
+          keys['%s.%s' % (table, c.Field)] = 1
+      except:
+        pass
+    keys = keys.keys()
+    keys.sort()
+    return keys
+
+  def getTableIds(self):
+    """
+    Calls the show table method and returns dictionnary of
     Field Ids
     """
     keys = []
-    for method_name in self.sql_catalog_schema:
+    method_name = self.sql_catalog_tables
+    try:
       method = getattr(self,  method_name)
       search_result = method()
       for c in search_result:
-        keys.append(c.Field)
+        keys.append(c[0])
+    except:
+      pass
     return keys
 
   # the cataloging API
-  def catalogObject(self, object, path):
+  def catalogObject(self, object, path, is_object_moved=0):
     """
     Adds an object to the Catalog by calling
     all SQL methods and providing needed arguments.
@@ -119,11 +160,10 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
     'uid' is the unique Catalog identifier for this object
 
     """
-    #LOG('Catalog object:',0,str(path))
+    LOG('Catalog object:',0,str(path))
 
     # Prepare the dictionnary of values
     kw = {}
-    #kw['path'] = join(object.getPhysicalPath(),'/')
 
     # Check if already Catalogued
     if hasattr(object, 'uid'):
@@ -131,11 +171,14 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
       # WARNING COPY PASTE....
       uid = object.uid
     else:
-      # Look up in path
+      # Look up in (previous) path
       uid = 0
-    index = self.getUidForPath(path)
+    if is_object_moved:
+      index = uid # We trust the current uid
+    else:
+      index = self.getUidForPath(path)
     if index:
-      if uid != index:
+      if (uid != index):
         # Update uid attribute of object
         uid = int(index)
         LOG("Write Uid",0, "uid %s index %s" % (uid, index))
@@ -187,7 +230,9 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
       # Get the appropriate SQL Method
       # Lookup by path is required because of OFS Semantics
       if uid:
-        # Make sure no duplicates
+        # Make sure no duplicates - ie. if an object with different path has same uid, we need a new uid
+        # This can be very dangerous with relations stored in a category table (CMFCategory)
+        # This is why we recommend completely reindexing subobjects after any change of id
         if self.hasUid(uid):
           uid = 0
       if not uid:
@@ -277,6 +322,8 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
     XXX Add filter of methods
 
     """
+    LOG('Uncatalog object:',0,str(path))
+
     uid = self.getUidForPath(path)
     methods = self.sql_uncatalog_object
     for method_name in methods:

product/ZSQLCatalog/ZSQLCatalog.py

@@ -127,81 +127,97 @@ class ZCatalog(Folder, Persistent, Implicit):
      ['searchResults', '__call__', 'uniqueValuesFor',
       'getpath', 'schema', 'names', 'columns', 'indexes', 'index_objects',
       'all_meta_types', 'valid_roles', 'resolve_url',
-      'getobject', 'getObject', 'getObjectList'],
+      'getobject', 'getObject', 'getObjectList', 'getCatalogSearchTableIds',
+      'getCatalogSearchResultKeys', ],
      ['Anonymous', 'Manager']),
     )
 
   _properties = (
-    {   'id'      : 'title',
+    { 'id'      : 'title',
       'description' : 'The title of this catalog',
       'type'    : 'string',
       'mode'    : 'w' },
-    {   'id'      : 'sql_catalog_object',
+    { 'id'      : 'sql_catalog_object',
       'description' : 'Methods to be called to catalog an object',
       'type'    : 'multiple selection',
       'select_variable' : 'getCatalogMethodIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_uncatalog_object',
+    { 'id'      : 'sql_uncatalog_object',
       'description' : 'Methods to be called to uncatalog an object',
       'type'    : 'multiple selection',
       'select_variable' : 'getCatalogMethodIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_update_object',
+    { 'id'      : 'sql_update_object',
       'description' : 'Methods will be called to updat a catalogued object',
       'type'    : 'multiple selection',
       'select_variable' : 'getCatalogMethodIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_clear_catalog',
+    { 'id'      : 'sql_clear_catalog',
       'description' : 'The methods which should be called to clear the catalog',
       'type'    : 'multiple selection',
       'select_variable' : 'getCatalogMethodIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_search_results',
+    { 'id'      : 'sql_search_results',
       'description' : 'Main method to search the catalog',
       'type'    : 'selection',
       'select_variable' : 'getCatalogMethodIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_count_results',
+    { 'id'      : 'sql_search_tables',
+      'description' : 'Tables to join in the result',
+      'type'    : 'multiple selection',
+      'select_variable' : 'getTableIds',
+      'mode'    : 'w' },
+    { 'id'      : 'sql_search_result_keys',
+      'description' : 'Keys to display in the result',
+      'type'    : 'multiple selection',
+      'select_variable' : 'getResultColumnIds',
+      'mode'    : 'w' },
+    { 'id'      : 'sql_count_results',
       'description' : 'Main method to search the catalog',
       'type'    : 'selection',
       'select_variable' : 'getCatalogMethodIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_getitem_by_path',
+    { 'id'      : 'sql_getitem_by_path',
       'description' : 'Get a catalog brain by path',
       'type'    : 'selection',
       'select_variable' : 'getCatalogMethodIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_getitem_by_uid',
+    { 'id'      : 'sql_getitem_by_uid',
       'description' : 'Get a catalog brain by uid',
       'type'    : 'selection',
       'select_variable' : 'getCatalogMethodIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_catalog_schema',
+    { 'id'      : 'sql_catalog_tables',
+      'description' : 'Method to get the main catalog tables',
+      'type'    : 'selection',
+      'select_variable' : 'getCatalogMethodIds',
+      'mode'    : 'w' },
+    { 'id'      : 'sql_catalog_schema',
       'description' : 'Method to get the main catalog schema',
-      'type'    : 'multiple selection',
+      'type'    : 'selection',
       'select_variable' : 'getCatalogMethodIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_unique_values',
-      'description' : 'Find unique disctinc values in a column',
+    { 'id'      : 'sql_unique_values',
+      'description' : 'Find unique disctinct values in a column',
       'type'    : 'selection',
       'select_variable' : 'getCatalogMethodIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_catalog_paths',
+    { 'id'      : 'sql_catalog_paths',
       'description' : 'List all object paths in catalog',
       'type'    : 'selection',
       'select_variable' : 'getCatalogMethodIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_catalog_keyword_search_keys',
+    { 'id'      : 'sql_catalog_keyword_search_keys',
       'description' : 'Columns which should be considered as full text search',
       'type'    : 'multiple selection',
       'select_variable' : 'getColumnIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_catalog_full_text_search_keys',
+    { 'id'      : 'sql_catalog_full_text_search_keys',
       'description' : 'Columns which should be considered as full text search',
       'type'    : 'multiple selection',
       'select_variable' : 'getColumnIds',
       'mode'    : 'w' },
-    {   'id'      : 'sql_catalog_request_keys',
+    { 'id'      : 'sql_catalog_request_keys',
       'description' : 'Columns which should be ignore in the REQUEST in order to accelerate caching',
       'type'    : 'multiple selection',
       'select_variable' : 'getColumnIds',
@@ -216,12 +232,15 @@ class ZCatalog(Folder, Persistent, Implicit):
   sql_count_results = 'count_results'
   sql_getitem_by_path = 'getitem_by_path'
   sql_getitem_by_uid = 'getitem_by_uid'
+  sql_catalog_tables = 'catalog_tables'
+  sql_search_tables = ()
   sql_catalog_schema = ('catalog_schema')
   sql_unique_values = 'unique_values'
   sql_catalog_paths = 'catalog_paths'
   sql_catalog_keyword_search_keys =  ('Description', 'Title', 'SearchableText')
   sql_catalog_full_text_search_keys = ()
   sql_catalog_request_keys = ()
+  sql_search_result_keys = ()
 
 
   manage_catalogAddRowForm = DTMLFile('dtml/catalogAddRowForm', globals())
@@ -400,7 +419,7 @@ class ZCatalog(Folder, Persistent, Implicit):
       RESPONSE.redirect(URL1 + '/manage_catalogSchema?manage_tabs_message=Schema%20Saved')
 
 
-  def catalog_object(self, obj, uid=None, idxs=[]):
+  def catalog_object(self, obj, uid=None, idxs=[], is_object_moved=0):
     """ wrapper around catalog """
 
     if uid is None:
@@ -414,7 +433,7 @@ class ZCatalog(Folder, Persistent, Implicit):
     elif not isinstance(uid, types.StringType):
       raise CatalogError('The object unique id must be a string.')
 
-    self._catalog.catalogObject(obj, uid)
+    self._catalog.catalogObject(obj, uid, is_object_moved=is_object_moved)
 
   def uncatalog_object(self, uid):
     """ wrapper around catalog """
@@ -610,7 +629,7 @@ class ZCatalog(Folder, Persistent, Implicit):
     for id, ob in items:
       if pre: p="%s/%s" % (pre, id)
       else:   p=id
-      
+
       dflag=0
       if hasattr(ob, '_p_changed') and (ob._p_changed == None):
         dflag=1
@@ -719,6 +738,38 @@ class ZCatalog(Folder, Persistent, Implicit):
           '%s unchanged.' % (len(fixed), len(removed), unchanged),
       action='./manage_main')
 
+  def getTableIds(self):
+    """Returns all tables of this catalog
+    """
+    return self._catalog.getTableIds()
+
+  def getCatalogSearchResultKeys(self):
+    """Return selected tables of catalog which are used in JOIN.
+       catalaog is always first
+    """
+    return self.sql_search_result_keys
+
+  def getCatalogSearchTableIds(self):
+    """Return selected tables of catalog which are used in JOIN.
+       catalaog is always first
+    """
+    if len(self.sql_search_tables) > 0:
+      if self.sql_search_tables[0] != 'catalog':
+        result = ['catalog']
+        for t in self.sql_search_tables:
+          if t != 'catalog':
+            result.append(t)
+        self.sql_search_tables = result
+    else:
+      self.sql_search_tables = ['catalog']
+    return self.sql_search_tables
+
+  def getResultColumnIds(self):
+    """Return selected tables of catalog which are used
+       as metadata
+    """
+    return self._catalog.getResultColumnIds()
+
   def getCatalogMethodIds(self):
     """Find Z SQL methods in the current folder and above
     This function return a list of ids.