diff --git a/bt5/erp5_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaymentService.xml b/bt5/erp5_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaymentService.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9f9d792c193beab49a368bac7885ee2559bdc24a
--- /dev/null
+++ b/bt5/erp5_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaymentService.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="Property Sheet" module="erp5.portal_type"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>PaymentService</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Property Sheet</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Length" module="BTrees.Length"/>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="OOBTree" module="BTrees.OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <global name="OOBTree" module="BTrees.OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaymentService/link_property.xml b/bt5/erp5_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaymentService/link_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..970ab9be9f58403c98e0e2ecc01d0a38a963d199
--- /dev/null
+++ b/bt5/erp5_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaymentService/link_property.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="Acquired Property" module="erp5.portal_type"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_local_properties</string> </key>
+ <value>
+ <tuple>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>mode</string> </value>
+ </item>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>string</string> </value>
+ </item>
+ </dictionary>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>elementary_type/content</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>content_acquired_property_id</string> </key>
+ <value>
+ <tuple>
+ <string>url_string</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>content_portal_type</string> </key>
+ <value> <string>python: (\'Link\',)</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>Link of the current payment service server</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>link_property</string> </value>
+ </item>
+ <item>
+ <key> <string>mode</string> </key>
+ <value> <string>w</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Acquired Property</string> </value>
+ </item>
+ <item>
+ <key> <string>storage_id</string> </key>
+ <value> <string>default_link</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaymentService/service_password_property.xml b/bt5/erp5_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaymentService/service_password_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7727eb7ac693d9d750a2ff1eaadfd2f6480c8aef
--- /dev/null
+++ b/bt5/erp5_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaymentService/service_password_property.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="Standard Property" module="erp5.portal_type"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_local_properties</string> </key>
+ <value>
+ <tuple>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>mode</string> </value>
+ </item>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>string</string> </value>
+ </item>
+ </dictionary>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>elementary_type/string</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>Account password</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>service_password_property</string> </value>
+ </item>
+ <item>
+ <key> <string>mode</string> </key>
+ <value> <string>w</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Standard Property</string> </value>
+ </item>
+ <item>
+ <key> <string>property_default</string> </key>
+ <value> <string>python: \'\'</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaymentService/service_username_property.xml b/bt5/erp5_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaymentService/service_username_property.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a77354a8e0e8418bfda49d4c0fe517a3f9de0270
--- /dev/null
+++ b/bt5/erp5_secure_payment/PropertySheetTemplateItem/portal_property_sheets/PaymentService/service_username_property.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="Standard Property" module="erp5.portal_type"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_local_properties</string> </key>
+ <value>
+ <tuple>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>mode</string> </value>
+ </item>
+ <item>
+ <key> <string>type</string> </key>
+ <value> <string>string</string> </value>
+ </item>
+ </dictionary>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>categories</string> </key>
+ <value>
+ <tuple>
+ <string>elementary_type/string</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string>Account username</string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>service_username_property</string> </value>
+ </item>
+ <item>
+ <key> <string>mode</string> </key>
+ <value> <string>w</string> </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string>Standard Property</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_secure_payment/bt/revision b/bt5/erp5_secure_payment/bt/revision
index 3cacc0b93c9c9c03a72da624ca28a09ba5c1336f..ca7bf83ac53a27a2a914bed25e1a07478dd8ef47 100644
--- a/bt5/erp5_secure_payment/bt/revision
+++ b/bt5/erp5_secure_payment/bt/revision
@@ -1 +1 @@
-12
\ No newline at end of file
+13
\ No newline at end of file
diff --git a/bt5/erp5_secure_payment/bt/template_property_sheet_id_list b/bt5/erp5_secure_payment/bt/template_property_sheet_id_list
new file mode 100644
index 0000000000000000000000000000000000000000..9ab5affebb4e8f9695aa26eb7389bd6c7d6d7169
--- /dev/null
+++ b/bt5/erp5_secure_payment/bt/template_property_sheet_id_list
@@ -0,0 +1 @@
+PaymentService
\ No newline at end of file
diff --git a/product/ERP5SecurePayment/PropertySheet/PaymentService.py b/product/ERP5SecurePayment/PropertySheet/PaymentService.py
deleted file mode 100644
index cb7dea8bf14c8f901007e27e919b68e087bdb6da..0000000000000000000000000000000000000000
--- a/product/ERP5SecurePayment/PropertySheet/PaymentService.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
-# Franč½ois-Xavier Algrain <fxalgrain@tiolive.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
-class PaymentService:
- """
- This property sheet defines payment service properties
- """
-
- _properties = (
- { 'id' : 'service_username',
- 'description' : 'Account username',
- 'type' : 'string',
- 'mode' : 'w' },
-
- { 'id' : 'service_password',
- 'description' : 'Account password',
- 'type' : 'string',
- 'default' : '',
- 'mode' : 'w' },
-
- { 'id' : 'link',
- 'storage_id' : 'default_link',
- 'description' : 'Link of the current payment service server',
- 'type' : 'content',
- 'portal_type' : ( 'Link', ),
- 'acquired_property_id' : ( 'url_string', ),
- 'mode' : 'w' },
-
- )