diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_countAccountingTransactions.py b/product/ERP5/skins/erp5_accounting/AccountModule_countAccountingTransactions.py
deleted file mode 100755
index 5e7dc75a05ecfe421c9e178fed712e654d097514..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_countAccountingTransactions.py
+++ /dev/null
@@ -1,25 +0,0 @@
-## Script (Python) "AccountModule_countAccountingTransactions"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=self
-##title=
-##
-currency = None
-
-if currency in (None, 'None'):
-  currency = context.currency.EUR
-
-
-#inventory = context.Resource_zGetInventory(node_uid=context.getUid(), omit_simulation=1,
-#                                           resource_uid=(currency.getUid(),),
-#                                           simulation_state=('draft', 'planned', 'confirmed', 'stopped', 'delivered'))
-
-inventory = context.Resource_zGetInventory(node_uid=self.uid, omit_simulation=1,
-                                           resource_uid=(currency.getUid(),),
-                                           simulation_state=('draft', 'planned', 'confirmed', 'stopped', 'delivered'))
-
-inventory = inventory[0]
-return str(inventory.stock_uid)
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_getAccountList.py b/product/ERP5/skins/erp5_accounting/AccountModule_getAccountList.py
deleted file mode 100755
index 07ccec8f26ca248fee17ff7cc0f54fb85a06edaa..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_getAccountList.py
+++ /dev/null
@@ -1,21 +0,0 @@
-## Script (Python) "AccountModule_getAccountList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=**kwd
-##title=
-##
-try:
-  currency = kwd['accounting_transaction_line_currency']
-  id = currency.split('/')[-1]
-except:
-  id = ''
-
-if not id:
-  id = ' '
-
-kwd['select_expression'] = "'%s' AS accounting_transaction_line_currency" % id
-
-return context.portal_catalog(**kwd)
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_getAccountingTransactionCount.py b/product/ERP5/skins/erp5_accounting/AccountModule_getAccountingTransactionCount.py
deleted file mode 100755
index a81f9dfe8250c25cbd7888e86cbaa8be076070cd..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_getAccountingTransactionCount.py
+++ /dev/null
@@ -1,35 +0,0 @@
-## Script (Python) "AccountModule_getAccountingTransactionCount"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=brain, selection, **kw
-##title=
-##
-params = selection.getParams()
-
-url = params.get('accounting_transaction_line_currency') # XXX This should be called resource
-if url:
-  currency = context.restrictedTraverse(url) # XXX portal_categories.resolveCategory(resource)
-else:
-  currency = None
-
-kwd = {}
-
-if params.get('from_date'): 
-  kwd['from_date'] = params['from_date']
-if params.get('to_date'):
-  kwd['to_date'] = params['to_date']
-if currency is not None:
-  kwd['resource_uid'] = [currency.getUid()]
-kwd['simulation_state'] = params.get('transaction_simulation_state', ('delivered', 'stopped')) # XXX Why not simulation_state ? choice of state should be in ERP5Globals or equiv.
-kwd['section_category'] = params.get('transaction_section_category', 'group/nexedi') # XXX Why not section_category ? also, default value should be defined for now in ERP5Globals and later through ERP5Site method
-
-inventory = context.Resource_zGetInventory(node_uid=context.getUid(), omit_simulation=1,
-                                           **kwd) 
-inventory = inventory[0]
-return str(inventory.stock_uid)
-
-# XXX should be return currency.getInventoryCount(from_date = params.get('from_date'), to_date=params.get('to_date'),  )
-# XXX should be actually return currency.getInventoryCount(**params  )
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_getCreditTransactionListUrl.py b/product/ERP5/skins/erp5_accounting/AccountModule_getCreditTransactionListUrl.py
deleted file mode 100755
index b1cee75a9dc67c7eb9fd5f33f98a868672638a73..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_getCreditTransactionListUrl.py
+++ /dev/null
@@ -1,46 +0,0 @@
-## Script (Python) "AccountModule_getCreditTransactionListUrl"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=brain=None, selection=None, **kwd
-##title=
-##
-from ZTUtils import make_query
-
-index = selection.getIndex()
-name = selection.getName()
-object = brain.getObject()
-
-url = object.absolute_url()
-method = 'Account_viewAccountingTransactionList'
-kw = { 'selection_index': str(index),
-       'selection_name' : name, 
-       'reset' : '1', 
-       'omit_output' : '1',
-     }
-
-params = selection.getParams()
-
-try:
-  path = params.get('accounting_transaction_line_currency')
-  if path:
-    currency = context.restrictedTraverse(path)
-  else:
-    currency = None
-except:
-  currency = None
-
-if params.get('from_date'):
-  kw['from_date'] = params['from_date']
-if params.get('to_date'):
-  kw['to_date'] = params['to_date']
-if currency is not None:
-  kw['resource_uid'] = [currency.getUid()]
-if params.get('transaction_simulation_state'):
-  kw['transaction_simulation_state'] = params['transaction_simulation_state']
-if params.get('transaction_section_category'):
-  kw['transaction_section_category'] = params['transaction_section_category']
-
-return url + '/' + method + '?' + make_query(kw)
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_getCurrencyUrl.py b/product/ERP5/skins/erp5_accounting/AccountModule_getCurrencyUrl.py
deleted file mode 100755
index 01dfde18cd93a2fa39cf0bb2489479694f17b1b0..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_getCurrencyUrl.py
+++ /dev/null
@@ -1,20 +0,0 @@
-## Script (Python) "AccountModule_getCurrencyUrl"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=brain=None, selection=None
-##title=
-##
-from ZTUtils import make_query
-
-params = selection.getParams()
-object = context.restrictedTraverse(params['accounting_transaction_line_currency'])
-url = object.absolute_url()
-method = 'view'
-kw = { 
-       'reset' : '1', 
-     }
-
-return url + '/' + method + '?' + make_query(kw)
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_getDebitTransactionListUrl.py b/product/ERP5/skins/erp5_accounting/AccountModule_getDebitTransactionListUrl.py
deleted file mode 100755
index 4648e91028512582025d5410424391efd20454c8..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_getDebitTransactionListUrl.py
+++ /dev/null
@@ -1,46 +0,0 @@
-## Script (Python) "AccountModule_getDebitTransactionListUrl"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=brain=None, selection=None
-##title=
-##
-from ZTUtils import make_query
-
-index = selection.getIndex()
-name = selection.getName()
-object = brain.getObject()
-
-url = object.absolute_url()
-method = 'Account_viewAccountingTransactionList'
-kw = { 'selection_index': str(index),
-       'selection_name' : name, 
-       'reset' : '1', 
-       'omit_input' : '1',
-     }
-
-params = selection.getParams()
-
-try:
-  path = params.get('accounting_transaction_line_currency')
-  if path:
-    currency = context.restrictedTraverse(path)
-  else:
-    currency = None
-except:
-  currency = None
-
-if params.get('from_date'):
-  kw['from_date'] = params['from_date']
-if params.get('to_date'):
-  kw['to_date'] = params['to_date']
-if currency is not None:
-  kw['resource_uid'] = [currency.getUid()]
-if params.get('transaction_simulation_state'):
-  kw['transaction_simulation_state'] = params['transaction_simulation_state']
-if params.get('transaction_section_category'):
-  kw['transaction_section_category'] = params['transaction_section_category']
-
-return url + '/' + method + '?' + make_query(kw)
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_getMirrorAccountUrl.py b/product/ERP5/skins/erp5_accounting/AccountModule_getMirrorAccountUrl.py
deleted file mode 100755
index 8286cff2d97f800680616f7afc797db519088af7..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_getMirrorAccountUrl.py
+++ /dev/null
@@ -1,19 +0,0 @@
-## Script (Python) "AccountModule_getMirrorAccountUrl"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=brain=None, selection=None
-##title=
-##
-index = selection.getIndex()
-name = selection.getName()
-object = brain.getObject()
-object = object.getDestinationValue()
-if object is None:
-  url = None
-else:
-  url = object.absolute_url() + '/view?selection_index=%s&selection_name=%s&reset=1' % (index, name)
-
-return url
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_getTotalSourceCredit.py b/product/ERP5/skins/erp5_accounting/AccountModule_getTotalSourceCredit.py
deleted file mode 100755
index af939f0a362a785906aa350adb28653526653738..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_getTotalSourceCredit.py
+++ /dev/null
@@ -1,37 +0,0 @@
-## Script (Python) "AccountModule_getTotalSourceCredit"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=brain=None, selection=None, **kw
-##title=
-##
-params = selection.getParams()
-
-url = params.get('accounting_transaction_line_currency')
-if url:
-  currency = context.restrictedTraverse(url)
-else:
-  currency = None
-
-kwd = {}
-
-if params.get('from_date'):
-  kwd['from_date'] = params['from_date']
-if params.get('to_date'):
-  kwd['to_date'] = params['to_date']
-if currency is not None:
-  kwd['resource_uid'] = [currency.getUid()]
-kwd['simulation_state'] = params.get('transaction_simulation_state', ('delivered', 'stopped'))
-kwd['section_category'] = params.get('transaction_section_category', 'group/nexedi')
-
-total = 0.0
-try:
-  inventory = context.Resource_zGetInventory(node_uid=context.getUid(), omit_output=1, omit_simulation=1,
-                                             **kwd)
-  total = inventory[0].inventory or 0.0
-except:
-  pass
-
-return '%.02f' % total
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_getTotalSourceDebit.py b/product/ERP5/skins/erp5_accounting/AccountModule_getTotalSourceDebit.py
deleted file mode 100755
index 42beed670e02cbd9a554677342f70995465610ed..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_getTotalSourceDebit.py
+++ /dev/null
@@ -1,37 +0,0 @@
-## Script (Python) "AccountModule_getTotalSourceDebit"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=brain=None, selection=None, **kw
-##title=
-##
-params = selection.getParams()
-
-url = params.get('accounting_transaction_line_currency')
-if url:
-  currency = context.restrictedTraverse(url)
-else:
-  currency = None
-
-kwd = {}
-
-if params.get('from_date'):
-  kwd['from_date'] = params['from_date']
-if params.get('to_date'):
-  kwd['to_date'] = params['to_date']
-if currency is not None:
-  kwd['resource_uid'] = [currency.getUid()]
-kwd['simulation_state'] = params.get('transaction_simulation_state', ('delivered', 'stopped'))
-kwd['section_category'] = params.get('transaction_section_category', 'group/nexedi')
-
-total = 0.0
-try:
-  inventory = context.Resource_zGetInventory(node_uid=context.getUid(), omit_input=1, omit_simulation=1,
-                                             **kwd) # XXX Choice of omit_input is very good.
-  total = - inventory[0].inventory or 0.0
-except:
-  pass
-
-return '%.02f' % total
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_getTransactionListUrl.py b/product/ERP5/skins/erp5_accounting/AccountModule_getTransactionListUrl.py
deleted file mode 100755
index 30423f1c78164ef0d2f20c47eb9c8b79dd88863c..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_getTransactionListUrl.py
+++ /dev/null
@@ -1,45 +0,0 @@
-## Script (Python) "AccountModule_getTransactionListUrl"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=brain=None, selection=None, **kwd
-##title=
-##
-from ZTUtils import make_query
-
-index = selection.getIndex()
-name = selection.getName()
-object = brain.getObject()
-
-url = object.absolute_url()
-method = 'Account_viewAccountingTransactionList'
-kw = { 'selection_index': str(index),
-       'selection_name' : name, 
-       'reset' : '1', 
-     }
-
-params = selection.getParams()
-
-try:
-  path = params.get('accounting_transaction_line_currency')
-  if path:
-    currency = context.restrictedTraverse(path)
-  else:
-    currency = None
-except:
-  currency = None
-
-if params.get('from_date'):
-  kw['from_date'] = params['from_date']
-if params.get('to_date'):
-  kw['to_date'] = params['to_date']
-if currency is not None:
-  kw['resource_uid'] = [currency.getUid()]
-if params.get('transaction_simulation_state'):
-  kw['transaction_simulation_state'] = params['transaction_simulation_state']
-if params.get('transaction_section_category'):
-  kw['transaction_section_category'] = params['transaction_section_category']
-
-return url + '/' + method + '?' + make_query(kw)
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_stat.py b/product/ERP5/skins/erp5_accounting/AccountModule_stat.py
deleted file mode 100755
index 93dfda00960a70b628d45dba609ea330ca318f59..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_stat.py
+++ /dev/null
@@ -1,12 +0,0 @@
-## Script (Python) "AccountModule_stat"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=**kwd
-##title=
-##
-return 'toto'
-
-return repr(kwd)
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_statAccountingTransactionCount.py b/product/ERP5/skins/erp5_accounting/AccountModule_statAccountingTransactionCount.py
deleted file mode 100755
index 1bd00232b145f5e3fd31787b461750a6f01dea49..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_statAccountingTransactionCount.py
+++ /dev/null
@@ -1,35 +0,0 @@
-## Script (Python) "AccountModule_statAccountingTransactionCount"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=**kw
-##title=
-##
-try:
-  url = kw['accounting_transaction_line_currency']
-  if url:
-    currency = context.restrictedTraverse(url)
-  else:
-    currency = None
-except:
-  currency = None
-
-params = {}
-if kw.get('query'):
-  params['query'] = kw['query']
-if kw.get('from_date'):
-  params['from_date'] = kw['from_date']
-if kw.get('to_date'):
-  params['to_date'] = kw['to_date']
-if currency is not None:
-  params['resource_uid'] = [currency.getUid()]
-params['simulation_state'] = kw.get('transaction_simulation_state', ('delivered', 'stopped'))
-params['section_category'] = kw.get('transaction_section_category', 'group/nexedi')
-
-result = context.Resource_zStatInventory(omit_simulation=1,
-                                         **params)
-
-row = result[0]
-return str(row.count or 0.0)
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_statTotalSourceCredit.py b/product/ERP5/skins/erp5_accounting/AccountModule_statTotalSourceCredit.py
deleted file mode 100755
index 341f583a5099ff456a4f55f6f95180c65b5f61ec..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_statTotalSourceCredit.py
+++ /dev/null
@@ -1,36 +0,0 @@
-## Script (Python) "AccountModule_statTotalSourceCredit"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=**kw
-##title=
-##
-try:
-  url = kw['accounting_transaction_line_currency']
-  if url:
-    currency = context.restrictedTraverse(url)
-  else:
-    currency = None
-except:
-  currency = None
-
-params = {}
-if kw.get('where_expression'):
-  params['where_expression'] = kw['where_expression']
-if kw.get('from_date'):
-  params['from_date'] = kw['from_date']
-if kw.get('to_date'):
-  params['to_date'] = kw['to_date']
-if currency is not None:
-  params['resource_uid'] = [currency.getUid()]
-params['simulation_state'] = kw.get('transaction_simulation_state', ('delivered', 'stopped'))
-params['section_category'] = kw.get('transaction_section_category', 'group/nexedi')
-
-result = context.Resource_zStatInventory(omit_simulation=1,
-                                         omit_output=1,
-                                         **params)
-
-row = result[0]
-return '%.02f' % (row.quantity or 0.0)
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_statTotalSourceDebit.py b/product/ERP5/skins/erp5_accounting/AccountModule_statTotalSourceDebit.py
deleted file mode 100755
index 14f548d2922a44c381360ea1993a00ac9bf5262d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_statTotalSourceDebit.py
+++ /dev/null
@@ -1,40 +0,0 @@
-## Script (Python) "AccountModule_statTotalSourceDebit"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=**kw
-##title=
-##
-try:
-  url = kw['accounting_transaction_line_currency']
-  if url:
-    currency = context.restrictedTraverse(url)
-  else:
-    currency = None
-except:
-  currency = None
-
-params = {}
-if kw.get('query'):
-  params['query'] = kw['query']
-if kw.get('from_date'):
-  params['from_date'] = kw['from_date']
-if kw.get('to_date'):
-  params['to_date'] = kw['to_date']
-if currency is not None:
-  params['resource_uid'] = [currency.getUid()]
-params['simulation_state'] = kw.get('transaction_simulation_state', ('delivered', 'stopped'))
-params['section_category'] = kw.get('transaction_section_category', 'group/nexedi')
-
-result = context.Resource_zStatInventory(omit_simulation=1,
-                                         omit_input=1,
-                                         **params)
-
-row = result[0]
-try:
-  quantity = - row.quantity
-except:
-  quantity = 0.0
-return '%.02f' % quantity
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_viewAccountList.form b/product/ERP5/skins/erp5_accounting/AccountModule_viewAccountList.form
deleted file mode 100755
index f042120ab5c20ae43644b3cb5d98d262b5b600d6..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_viewAccountList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Account List</title>
-  <row_length>4</row_length>
-  <name>AccountModule_viewAccountList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[('id', 'id'), ('pcg_title', 'PCG'), ('Title', 'Title'), ('default_destination_title', 'Mirror'), ('AccountModule_getAccountingTransactionCount', 'Count'), ('AccountModule_getTotalSourceCredit', 'Credit'), ('AccountModule_getTotalSourceDebit', 'Debit'), ('accounting_transaction_line_currency', 'Currency')]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('pcg_title', 'PCG'), ('Title', 'Title'), ('default_destination_title', 'Mirror'), ('AccountModule_getAccountingTransactionCount', 'Count'), ('AccountModule_getTotalSourceDebit', 'Debit'), ('AccountModule_getTotalSourceCredit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('pcg_title', "''"), ('Title', "''"), ('default_destination_title', "''")]</default_params>
-          <description></description>
-          <domain_root_list type="list">[('portal_categories/pcg', 'PCG'), ('portal_categories/account_type', 'Account Type'), ('portal_categories/financial_section', 'Balance Sheet')]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">25</lines>
-          <list_action>list</list_action>
-          <list_method type="method">AccountModule_getAccountList</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Account', 'Account')]</portal_types>
-          <report_root_list type="list">[('portal_categories/pcg', 'PCG'), ('portal_categories/account_type', 'Account Type')]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>account_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns type="list">[('id', 'id'), ('Title', 'Title'), ('default_destination_title', 'default_destination_title'), ('AccountModule_getAccountingTransactionCount', 'AccountModule_statAccountingTransactionCount'), ('AccountModule_getTotalSourceDebit', 'AccountModule_statTotalSourceDebit'), ('AccountModule_getTotalSourceCredit', 'AccountModule_statTotalSourceCredit')]</stat_columns>
-          <stat_method type="method">portal_catalog</stat_method>
-          <title>Account Listbox</title>
-          <url_columns type="list">[('default_destination_title', 'AccountModule_getMirrorAccountUrl'), ('AccountModule_getAccountingTransactionCount', 'AccountModule_getTransactionListUrl'), ('AccountModule_getTotalSourceCredit', 'AccountModule_getCreditTransactionListUrl'), ('AccountModule_getTotalSourceDebit', 'AccountModule_getDebitTransactionListUrl'), ('accounting_transaction_line_currency', 'AccountModule_getCurrencyUrl')]</url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/AccountModule_viewSearchDialog.form b/product/ERP5/skins/erp5_accounting/AccountModule_viewSearchDialog.form
deleted file mode 100755
index 71efaeae7791f95919ef5ebc49f1f116957b95aa..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountModule_viewSearchDialog.form
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Search</title>
-  <row_length>4</row_length>
-  <name>AccountModule_viewSearchDialog</name>
-  <pt>form_dialog</pt>
-  <action>AccountModule_viewAccountList</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>%</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>%</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_transaction_simulation_state</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">['stopped', 'delivered']</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('cancelled', 'cancelled'), ('confirmed', 'confirmed'), ('delivered', 'delivered'), ('draft', 'draft'), ('planned', 'planned'), ('stopped', 'stopped')]</items>
-          <required type="int">0</required>
-          <size type="int">5</size>
-          <title>State</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_from_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>From</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_to_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>To</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_accounting_transaction_line_currency</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[['', '']]+map(lambda x:(x.id,'currency/%s' %x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_transaction_section_category</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Nexedi', 'group/nexedi')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Section</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/AccountTemplate_view.form b/product/ERP5/skins/erp5_accounting/AccountTemplate_view.form
deleted file mode 100755
index cbc82a6faeb132eb36fbf93239afa8a3010d779b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountTemplate_view.form
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Account</title>
-  <row_length>4</row_length>
-  <name>accounting_transaction_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('quantity', 'Quantity'), ('parent_title', 'Concerned Invoice'), ('type', 'Type'), ('date', 'Date')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">1</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">25</lines>
-          <list_action>list</list_action>
-          <list_method type="method">Sql_zStockAccountParent</list_method>
-          <meta_types type="list">[]</meta_types>
-          <not_viewable type="int">0</not_viewable>
-          <portal_types type="list">[('Accounting Transaction', 'Accounting Transaction'), ('Purchase Invoice Transaction', 'Purchase Invoice Transaction'), ('Sale Invoice Transaction', 'Sale Invoice Transaction')]</portal_types>
-          <read_only type="int">0</read_only>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>account_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Transactions concerned by this account</title>
-          <url_columns></url_columns>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Account_getPcgItemList.py b/product/ERP5/skins/erp5_accounting/Account_getPcgItemList.py
deleted file mode 100755
index 599dd347bc85a3271e022c06c1d8d7b0781d4e46..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Account_getPcgItemList.py
+++ /dev/null
@@ -1,18 +0,0 @@
-## Script (Python) "Account_getPcgItemList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-def display(x):
-  return "%s - %s" % (x.getId(), x.getTitle())
-
-def sort(x,y):
-  return cmp(display(x), display(y))
-
-obj = context.restrictedTraverse('portal_categories/pcg')
-item_list = obj.getCategoryChildItemList(base=0, display_method=display, sort_method=sort)
-return item_list
diff --git a/product/ERP5/skins/erp5_accounting/Account_search.py b/product/ERP5/skins/erp5_accounting/Account_search.py
deleted file mode 100755
index d97f34d7bcfb30519ccb12ecae29e8283a38b970..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Account_search.py
+++ /dev/null
@@ -1,15 +0,0 @@
-## Script (Python) "Account_search"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=**kwd
-##title=
-##
-for cname in kwd.keys():
-  if kwd[cname] == '' or kwd[cname] is None:
-    del kwd[cname]
-
-kwd['select_expression'] = "'EUR' AS accounting_transaction_line_currency"
-return context.portal_catalog(**kwd)
diff --git a/product/ERP5/skins/erp5_accounting/Account_view.form b/product/ERP5/skins/erp5_accounting/Account_view.form
deleted file mode 100755
index 8e864079d5ecfc495adaad894b9e09a56cf716ea..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Account_view.form
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Account</title>
-  <row_length>4</row_length>
-  <name>accounting_transaction_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_is_credit_account</id> <type>CheckBoxField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="int">0</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <title>Credit Account</title>
-        </values>
-        <tales>
-          <default>here/getIsCreditAccount</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      <field><id>my_pcg</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>PCG</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: here.Account_getPcgItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_account_type</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Account Type</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:here.portal_categories.account_type.getCategoryChildTitleItemList(base=0)</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_financial_section</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Financial Section</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/financial_section/getCategoryChildTitleItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_list</id> <type>MultiRelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>relative_url</catalog_index>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <default_module>account</default_module>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <portal_type type="list">[('Account', 'account')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Mirror account</title>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <view_separator>&lt;br /&gt;</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">80</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Account_viewAccountingTransactionList.form b/product/ERP5/skins/erp5_accounting/Account_viewAccountingTransactionList.form
deleted file mode 100755
index 9a2325b1865c17242298f64eefa6be68cd1d121b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Account_viewAccountingTransactionList.form
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Account</title>
-  <row_length>4</row_length>
-  <name>Account_viewAccountingTransactionList</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('Title', 'Title'), ('getStopDate', 'Date'), ('Type', 'Type'), ('reference', 'Invoice Number'), ('simulation_state', 'State'), ('source_debit', 'Debit'), ('source_credit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[('portal_categories/group', 'Group'), ('portal_categories/region', 'Region')]</domain_root_list>
-          <domain_tree type="int">1</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">25</lines>
-          <list_action>Base_jumpToAccountingTransaction?from_account=1</list_action>
-          <list_method type="method">Account_zGetTransactionList</list_method>
-          <meta_types type="list">[]</meta_types>
-          <not_viewable type="int">0</not_viewable>
-          <portal_types type="list">[('Accounting Transaction', 'Accounting Transaction'), ('Purchase Invoice Transaction', 'Purchase Invoice Transaction'), ('Sale Invoice Transaction', 'Sale Invoice Transaction'), ('Balance Transaction', 'Balance Transaction')]</portal_types>
-          <read_only type="int">0</read_only>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>account_history_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns type="list">[('source_debit', 'Account_statSourceDebit'), ('source_credit', 'Account_statSourceCredit')]</stat_columns>
-          <stat_method></stat_method>
-          <title>Transactions related to this account</title>
-          <url_columns type="list">[]</url_columns>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransactionLine_view.form b/product/ERP5/skins/erp5_accounting/AccountingTransactionLine_view.form
deleted file mode 100755
index d7b0b6d393107a576fd7e80cef0f7e46999f10e0..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransactionLine_view.form
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Accounting Transaction Line</title>
-  <row_length>4</row_length>
-  <name>accounting_transaction_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:map(lambda x: (x.id,'currency/%s' % x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>account</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Account', 'account')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Destination</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>account</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Account', 'account')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Source</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Source Credit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Source Debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.py b/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.py
deleted file mode 100755
index 821f8c4179ffab4c735406d8d2ac37932f8cafcc..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_getAccountingTransactionList.py
+++ /dev/null
@@ -1,24 +0,0 @@
-## Script (Python) "AccountingTransactionModule_getAccountingTransactionList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=**params
-##title=
-##
-# XXX workarounds for DTML limitation
-# Because DTML cannot do <dtml-if node or resource or...>
-# If Python is used, it does not check the existence of a variable automatically
-if 'node' not in params:
-  params['node'] = []
-if 'resource' not in params:
-  params['resource'] = []
-if 'from_date' not in params:
-  params['from_date'] = ''
-if 'to_date' not in params:
-  params['to_date'] = ''
-if 'section_category' not in params:
-  params['section_category'] = ''
-
-return context.AccountingTransactionModule_zGetAccountingTransactionList(**params)
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_getDestinationSectionUrl.py b/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_getDestinationSectionUrl.py
deleted file mode 100755
index 165e1ff4fc9bf30f132535e999f2a94b34dbfa74..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_getDestinationSectionUrl.py
+++ /dev/null
@@ -1,22 +0,0 @@
-## Script (Python) "AccountingTransactionModule_getDestinationSectionUrl"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=brain=None, selection=None, **kwd
-##title=
-##
-from ZTUtils import make_query
-
-index = selection.getIndex()
-name = selection.getName()
-object = brain.getObject()
-
-url = object.getDestinationSectionValue().absolute_url()
-method = 'Entity_viewAccountingTransactionList'
-kw = { 
-       'reset' : '1', 
-     }
-
-return url + '/' + method + '?' + make_query(kw)
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_getSourceCredit.py b/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_getSourceCredit.py
deleted file mode 100755
index 3e629a615a5659dd18e7fbf014a7e386f7c7dc8d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_getSourceCredit.py
+++ /dev/null
@@ -1,19 +0,0 @@
-## Script (Python) "AccountingTransactionModule_getSourceCredit"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=brain=None, selection=None, **kw
-##title=
-##
-params = selection.getParams()
-kw = {}
-kw['section_category'] = params.get('section_category', 'group/nexedi')
-kw['stat'] = 1
-kw['omit_output'] = 1
-kw['transaction'] = context.getUid()
-
-result = context.AccountingTransactionModule_zGetAccountingTransactionList(selection=selection, **kw)
-row = result[0]
-return '%.02f' % (row.quantity or 0.0)
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_getSourceDebit.py b/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_getSourceDebit.py
deleted file mode 100755
index 5d2483849d2514ce22d0da4dca5e0b0a04955704..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_getSourceDebit.py
+++ /dev/null
@@ -1,19 +0,0 @@
-## Script (Python) "AccountingTransactionModule_getSourceDebit"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=brain=None, selection=None, **kw
-##title=
-##
-params = selection.getParams()
-kw = {}
-kw['section_category'] = params.get('section_category', 'group/nexedi')
-kw['stat'] = 1
-kw['omit_input'] = 1
-kw['transaction'] = context.getUid()
-
-result = context.AccountingTransactionModule_zGetAccountingTransactionList(selection=selection, **kw)
-row = result[0]
-return '%.02f' % (row.quantity and - row.quantity or 0.0)
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.py b/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.py
deleted file mode 100755
index 9285751a63a222847d9444007a0bfd3ce1b412f3..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_statSourceCredit.py
+++ /dev/null
@@ -1,17 +0,0 @@
-## Script (Python) "AccountingTransactionModule_statSourceCredit"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=**kw
-##title=
-##
-kw['selection_params'] = kw
-kw['section_category'] = kw.get('section_category', 'group/nexedi')
-kw['stat'] = 1
-kw['omit_output'] = 1
-
-result = context.AccountingTransactionModule_zGetAccountingTransactionList(**kw)
-row = result[0]
-return '%.02f' % (row.quantity or 0.0)
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.py b/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.py
deleted file mode 100755
index df0026274d5a858ea81781e48f62475159b7ca9f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_statSourceDebit.py
+++ /dev/null
@@ -1,17 +0,0 @@
-## Script (Python) "AccountingTransactionModule_statSourceDebit"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=**kw
-##title=
-##
-kw['selection_params'] = kw
-kw['section_category'] = kw.get('section_category', 'group/nexedi')
-kw['stat'] = 1
-kw['omit_input'] = 1
-
-result = context.AccountingTransactionModule_zGetAccountingTransactionList(**kw)
-row = result[0]
-return '%.02f' % (row.quantity and - row.quantity or 0.0)
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList.form b/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList.form
deleted file mode 100755
index 2515b6a4d79c9e151a73976984343671e9d4122d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList.form
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Accounting Transactions</title>
-  <row_length>4</row_length>
-  <name>AccountingTransactionModule_viewAccountingTransactionList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[('id', 'id'), ('Title', 'Title'), ('default_destination_section_title', 'Destination'), ('Type', 'Type'), ('getStopDate', 'Date'), ('reference', 'Invoice Number'), ('source_reference', 'Source Reference'), ('destination_reference', 'Destination Reference'), ('simulation_state', 'State'), ('AccountingTransactionModule_getSourceCredit', 'Credit'), ('AccountingTransactionModule_getSourceDebit', 'Debit')]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('Title', 'Title'), ('default_destination_section_title', 'Destination'), ('Type', 'Type'), ('getStopDate', 'Date'), ('reference', 'Invoice Number'), ('source_reference', 'Source Reference'), ('destination_reference', 'Destination Reference'), ('simulation_state', 'State'), ('AccountingTransactionModule_getSourceDebit', 'Debit'), ('AccountingTransactionModule_getSourceCredit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_method type="method">AccountingTransactionModule_zGetAccountingTransactionList</list_method>
-          <meta_types type="list">[]</meta_types>
-          <not_viewable type="int">0</not_viewable>
-          <portal_types type="list">[('Accounting Transaction', 'Accounting Transaction'), ('Balance Transaction', 'Balance Transaction'), ('Purchase Invoice Transaction', 'Purchase Invoice Transaction'), ('Sale Invoice Transaction', 'Sale Invoice Transaction'), ('Pay Sheet Transaction', 'Pay Sheet Transaction'), ('Payment Transaction', 'Payment Transaction')]</portal_types>
-          <read_only type="int">0</read_only>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>accounting_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns type="list">[('AccountingTransactionModule_getSourceCredit', 'AccountingTransactionModule_statSourceCredit'), ('AccountingTransactionModule_getSourceDebit', 'AccountingTransactionModule_statSourceDebit')]</stat_columns>
-          <stat_method></stat_method>
-          <title>Accounting Transaction List</title>
-          <url_columns type="list">[('default_destination_section_title', 'AccountingTransactionModule_getDestinationSectionUrl')]</url_columns>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_viewSearchDialog.form b/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_viewSearchDialog.form
deleted file mode 100755
index 7b7a07e9062cd98a0cc794f6d43eeef884ce6df9..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_viewSearchDialog.form
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Search</title>
-  <row_length>4</row_length>
-  <name>AccountingTransactionModule_viewSearchDialog</name>
-  <pt>form_dialog</pt>
-  <action>AccountingTransactionModule_viewAccountingTransactionList</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>%</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_Title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>%</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_simulation_state</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('cancelled', 'cancelled'), ('confirmed', 'confirmed'), ('delivered', 'delivered'), ('draft', 'draft'), ('planned', 'planned'), ('stopped', 'stopped')]</items>
-          <required type="int">0</required>
-          <size type="int">5</size>
-          <title>State</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_node</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">5</size>
-          <title>Account</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-          <items>python: here.InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_from_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>From</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_to_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>To</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[['', '']]+map(lambda x:(x.id,'currency/%s' %x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_section_category</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Nexedi', 'group/nexedi')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Section</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.zsql b/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.zsql
deleted file mode 100755
index 41056a9479f66c3bc47066f847da6a258cfc2e2c..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_zGetAccountingTransactionList.zsql
+++ /dev/null
@@ -1,95 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:ZSQLBrain
-class_file:zsqlbrain.py
-</dtml-comment>
-<params>selection=""
-selection_params=""
-selection_domain
-selection_report
-select_expression
-from_date=""
-to_date=""
-node=""
-resource=""
-entity=""
-stat=""
-omit_input
-omit_output
-transaction=""
-section_category=""</params>
-<dtml-let params="selection and selection.getParams() or selection_params">
-<dtml-let allowed_roles_and_users="portal_catalog.getAllowedRolesAndUsers(**params)">
-
-<dtml-comment>do something to have a query without RolesAndUsers security for global stats</dtml-comment>
-<dtml-let query="(stat and not transaction) and portal_catalog.buildSQLQuery(**params) or portal_catalog.buildSQLQuery(allowedRolesAndUsers=allowed_roles_and_users, **params)">
-
-<dtml-comment>do something to prevent having entity and section_category set at the same time</dtml-comment>
-<dtml-let section_category="not entity and section_category or ''">
-
-SELECT
-  <dtml-if stat>
-    SUM(stock.quantity) AS quantity
-  <dtml-else>
-    DISTINCT
-    <dtml-in "portal_catalog.getCatalogSearchResultKeys()"> <dtml-var sequence-item> <dtml-unless sequence-end>,</dtml-unless> </dtml-in>
-    <dtml-if select_expression>, <dtml-var select_expression> </dtml-if>
-  </dtml-if>
-
-FROM
-  <dtml-var "','.join(query['from_table_list'])">
-  <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>
-  <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>
-
-  <dtml-if "from_date or to_date or node or resource or entity or stat or section_category">, catalog AS child </dtml-if>
-  <dtml-if "from_date or to_date or node or resource or stat">, movement </dtml-if>
-  <dtml-if "entity or stat or section_category">, stock </dtml-if>
-  <dtml-if node>, catalog AS source_account </dtml-if>
-  <dtml-if resource>, catalog AS currency </dtml-if>
-  <dtml-if entity>, catalog AS related_entity </dtml-if>
-  <dtml-if section_category>, category, catalog AS section_c </dtml-if>
-
-WHERE
-  1 = 1
-  <dtml-in "query['from_table_list']"><dtml-if "_['sequence-item']=='roles_and_users'">AND catalog.security_uid = <dtml-var sequence-item>.uid <dtml-else> AND catalog.uid = <dtml-var sequence-item>.uid </dtml-if> </dtml-in>
-  <dtml-if "query['where_expression']">
-    AND <dtml-var "query['where_expression']">
-  </dtml-if>
-  <dtml-if selection_domain>
-    AND <dtml-var "selection_domain.asSqlExpression()">
-  </dtml-if>
-  <dtml-if selection_report>
-    AND <dtml-var "selection_report.asSqlExpression(strict_membership=1)">
-  </dtml-if>
-
-  <dtml-if "from_date or to_date or node or resource or entity or stat or section_category"> AND child.parent_uid = catalog.uid </dtml-if>
-  <dtml-if "from_date or to_date or node or resource or stat"> AND movement.uid = child.uid </dtml-if>
-  <dtml-if "entity or stat or section_category"> AND stock.uid = child.uid </dtml-if>
-  <dtml-if node> AND source_account.uid = movement.source_uid </dtml-if>
-  <dtml-if resource> AND currency.uid = movement.resource_uid </dtml-if>
-  <dtml-if entity> AND related_entity.uid = stock.section_uid </dtml-if>
-  <dtml-if section_category> AND category.uid = stock.section_uid AND section_c.uid = category.category_uid </dtml-if>
-
-  <dtml-if from_date> AND movement.stop_date >= <dtml-sqlvar from_date type="string"> </dtml-if>
-  <dtml-if to_date> AND movement.stop_date <= <dtml-sqlvar to_date type="string"> </dtml-if>
-  <dtml-if node> AND ( <dtml-in node> <dtml-unless sequence-start>OR</dtml-unless> source_account.relative_url = '<dtml-var sequence-item>' </dtml-in> ) </dtml-if>
-  <dtml-if resource> AND currency.relative_url = '<dtml-var resource>' </dtml-if>
-  <dtml-if entity> AND related_entity.relative_url = '<dtml-var entity>' </dtml-if>
-  <dtml-if stat> AND movement.is_accountable = 1 </dtml-if>
-  <dtml-if omit_input> AND stock.quantity < 0 </dtml-if>
-  <dtml-if omit_output> AND stock.quantity > 0 </dtml-if>
-  <dtml-if transaction> AND catalog.uid = '<dtml-var transaction>' </dtml-if>
-  <dtml-if section_category> AND section_c.relative_url = '<dtml-var section_category>' </dtml-if>
-
-<dtml-if "query['order_by_expression']">
-  ORDER BY <dtml-var "query['order_by_expression']">
-</dtml-if>
-
-</dtml-let>
-</dtml-let>
-</dtml-let>
-</dtml-let>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_zGetQuantity.zsql b/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_zGetQuantity.zsql
deleted file mode 100755
index e0d012e9f1b8aaae2904308687c50ce0a07796aa..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransactionModule_zGetQuantity.zsql
+++ /dev/null
@@ -1,102 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:
-class_file:
-</dtml-comment>
-<params>query
-node:list
-simulation_state:list
-from_date
-to_date
-resource:list
-section_category
-transaction
-omit_input
-omit_output</params>
-SELECT
-  SUM(stock.quantity) AS quantity
-FROM
-  catalog
-  , catalog AS child
-  , movement
-  , stock
-<dtml-if resource>
-  , catalog AS resource
-</dtml-if>
-<dtml-if node>
-  , catalog AS node
-</dtml-if>
-<dtml-if section_category>
-  , catalog AS section_c
-  , catalog AS section_bc
-  , category AS section_membership
-  , catalog AS section
-</dtml-if>
-<dtml-if query>
-  , category
-  , roles_and_users
-  , subject
-</dtml-if>
-WHERE
-  catalog.uid = child.parent_uid
-  AND child.uid = stock.uid
-  AND child.uid = movement.uid
-  AND movement.is_accountable = 1
-<dtml-if transaction>
-  AND catalog.uid = <dtml-sqlvar transaction type="int">
-</dtml-if>
-<dtml-if resource>
-  AND movement.resource_uid = resource.uid
-  AND (
-  <dtml-in resource>
-    resource.relative_url = <dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else> OR </dtml-if>
-  </dtml-in>
-  )
-</dtml-if>
-<dtml-if node>
-  AND stock.node_uid = node.uid
-  AND (
-  <dtml-in node>
-    node.relative_url = <dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else> OR </dtml-if>
-  </dtml-in>
-  )
-</dtml-if>
-<dtml-if from_date>
-  AND movement.stop_date >= <dtml-sqlvar from_date type="string">
-</dtml-if>
-<dtml-if to_date>
-  AND movement.stop_date < <dtml-sqlvar to_date type="string">
-</dtml-if>
-<dtml-if simulation_state>
-  AND (
-  <dtml-in simulation_state>
-    catalog.simulation_state = <dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else> OR </dtml-if>
-  </dtml-in>
-  )
-</dtml-if>
-<dtml-if section_category>
-  AND section.uid = stock.section_uid
-  AND section_c.relative_url = <dtml-sqlvar section_category type="string">
-  AND section_membership.category_uid =  section_c.uid
-  AND section_membership.base_category_uid = section_bc.uid
-  AND section_membership.uid = section.uid
-</dtml-if>
-<dtml-if omit_input>
-  AND stock.quantity < 0
-</dtml-if>
-<dtml-if omit_output>
-  AND stock.quantity > 0
-</dtml-if>
-<dtml-if query>
-  AND catalog.uid = category.uid
-  AND catalog.uid = roles_and_users.uid
-  AND catalog.uid = subject.uid
-  AND <dtml-var query>
-</dtml-if>
-<dtml-if sort_on>
-  ORDER BY <dtml-var sort_on>
-</dtml-if>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransaction_searchInvoiceTransactionLines.py b/product/ERP5/skins/erp5_accounting/AccountingTransaction_searchInvoiceTransactionLines.py
deleted file mode 100755
index 2cd74c56091fafb820b92b8a6705d61b6e1d82a2..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransaction_searchInvoiceTransactionLines.py
+++ /dev/null
@@ -1,33 +0,0 @@
-## Script (Python) "AccountingTransaction_searchInvoiceTransactionLines"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=**kw
-##title=
-##
-sort_dict = { 'income': '\0\0',
-              'expense': '\0\0',
-              'receivable': '\0\1',
-              'payable': '\0\1',
-              'collected_vat': '\0\2',
-              'refundable_vat': '\0\3' }
-
-def sortInvoiceTransactionLine(a, b):
-  a_id = a.getId()
-  if a_id in sort_dict:
-    a_id = sort_dict[a_id]
-  b_id = b.getId()
-  if b_id in sort_dict:
-    b_id = sort_dict[b_id]
-  return cmp(a_id, b_id)
-
-object_list = []
-
-for o in context.searchFolder(**kw):
-  obj = o.getObject()
-  object_list.append(obj)
-
-object_list.sort(sortInvoiceTransactionLine)
-return object_list
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransaction_view.form b/product/ERP5/skins/erp5_accounting/AccountingTransaction_view.form
deleted file mode 100755
index c2e555721471c6534d9f332007e8cf03347a48b0..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransaction_view.form
+++ /dev/null
@@ -1,520 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Accounting Transaction</title>
-  <row_length>4</row_length>
-  <name>AccountingTransaction_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_source_section</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Section</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: [['Nexedi', 'organisation/nexedi']]</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Section Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Third Party</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[('','')]+map(lambda x:(x.id,'currency/%s' %x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Operation Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>simulation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'simulation_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Third Party Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('source', 'Account'), ('source_debit', 'Debit'), ('source_credit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('source_debit', 'Debit'), ('source_credit', 'Credit'), ('source', 'Account')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">AccountingTransaction_searchInvoiceTransactionLines</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>accounting_transaction_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Accounting Transaction Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[('','')] + map(lambda x: (x.title,'account/%s' % x.id),here.account.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_credit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>listbox_title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransaction_viewAccountingTransactionLineList.form b/product/ERP5/skins/erp5_accounting/AccountingTransaction_viewAccountingTransactionLineList.form
deleted file mode 100755
index df9ba4ee857c09bfbdf492b2d068fd9dc4978a2f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransaction_viewAccountingTransactionLineList.form
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title></title>
-  <row_length>4</row_length>
-  <name>accounting_transaction_list</name>
-  <pt>form_list</pt>
-  <action></action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('start_date', 'start_date'), ('stop_date', 'stop_date'), ('id', 'id'), ('Type', 'Type')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[('portal_categories/pcg', 'PCG'), ('portal_categories/financial_section', 'Financial Section'), ('portal_categories/account_type', 'Account type')]</domain_root_list>
-          <domain_tree type="int">1</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_method type="method">Sql_zStockAccountDate</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Accounting Transaction', 'Accounting Transaction'), ('Purchase Invoice Transaction', 'Purchase Invoice Transaction'), ('Sale Invoice Transaction', 'Sale Invoice Transaction')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">1</select>
-          <selection_name>transaction_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method type="method">Sql_zStockAccountDateStat</stat_method>
-          <title>Transaction Line List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/AccountingTransaction_viewDetails.form b/product/ERP5/skins/erp5_accounting/AccountingTransaction_viewDetails.form
deleted file mode 100755
index f296d92ee7f770cc0b0771f5fdd524a8f257b969..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/AccountingTransaction_viewDetails.form
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Accounting Transaction</title>
-  <row_length>4</row_length>
-  <name>AccountingTransaction_viewDetails</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_source_section</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Section</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: [['Nexedi', 'organisation/nexedi']]</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Section Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Third Party</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission></editable_permission>
-          <editable_role></editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission></viewable_permission>
-          <viewable_role></viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[('','')]+map(lambda x:(x.id,'currency/%s' %x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Start Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Stop Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>simulation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">1</read_only>
-          <required type="int">0</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'simulation_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Third Party Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('source', 'Section Account'), ('source_debit', 'Debit'), ('source_credit', 'Credit'), ('destination', 'Third Party Account'), ('destination_debit', 'Debit'), ('destination_credit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('source_debit', 'Debit'), ('source_credit', 'Credit'), ('destination', 'Destination'), ('source', 'Source')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[('resource', 'resource')]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">AccountingTransaction_searchInvoiceTransactionLines</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>accounting_transaction_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Accounting Transaction Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Accounting_viewReport.form b/product/ERP5/skins/erp5_accounting/Accounting_viewReport.form
deleted file mode 100755
index 441226cf3dbd6591a91c3019c670a6a4b8d81467..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Accounting_viewReport.form
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Accounting Report</title>
-  <row_length>1</row_length>
-  <name>accounting_transaction_search</name>
-  <pt>form_dialog</pt>
-  <action>AccountingTransaction_viewAccountingTransactionLineList</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">1</required>
-          <time_separator>:</time_separator>
-          <title>Start date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">1</required>
-          <time_separator>:</time_separator>
-          <title>Stop date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/BalanceTransactionLine_view.form b/product/ERP5/skins/erp5_accounting/BalanceTransactionLine_view.form
deleted file mode 100755
index 09bb34cbe7b36fc11a5d03ee872fd89dd21b1965..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/BalanceTransactionLine_view.form
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Balance Transaction Line</title>
-  <row_length>4</row_length>
-  <name>BalanceTransactionLine_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Account</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:here.InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_payment</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Bank Account</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: here.AccountingTransactionLine_getSourcePaymentItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Third Party</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:map(lambda x: (x.id,'currency/%s' % x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Credit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/BalanceTransaction_view.form b/product/ERP5/skins/erp5_accounting/BalanceTransaction_view.form
deleted file mode 100755
index 27ce601807157109a96a63f7f3e19b72cd954263..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/BalanceTransaction_view.form
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Balance Transaction</title>
-  <row_length>4</row_length>
-  <name>BalanceTransaction_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_source_section</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Section</title>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: [['Nexedi', 'organisation/nexedi'], ]</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Operation Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>simulation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">1</read_only>
-          <required type="int">0</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python: here.portal_workflow.getInfoFor(here, 'simulation_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('source', 'Account'), ('source_payment', 'Bank Account'), ('getDestinationSectionTitle', 'Third Party'), ('resource', 'Currency'), ('source_debit', 'Debit'), ('source_credit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('source', 'Account'), ('source_payment', 'Bank Account'), ('resource', 'Currency'), ('source_debit', 'Debit'), ('source_credit', 'Credit')]</editable_columns>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[('source_section', 'source_section')]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">AccountingTransaction_searchInvoiceTransactionLines</list_method>
-          <meta_types type="list">[]</meta_types>
-          <not_viewable type="int">0</not_viewable>
-          <portal_types type="list">[]</portal_types>
-          <read_only type="int">0</read_only>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>balance_transaction_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns type="list">[]</stat_columns>
-          <stat_method></stat_method>
-          <title>Balance Transaction Lines</title>
-          <url_columns type="list">[]</url_columns>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_source_payment</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source_payment</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: cell.getObject().AccountingTransactionLine_getSourcePaymentItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_resource</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[('','')]+map(lambda x:(x.id,'currency/%s' %x.id),cell.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_credit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_destination_section_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>listbox_destination_section_title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/CurrencyModule_viewCurrencyList.form b/product/ERP5/skins/erp5_accounting/CurrencyModule_viewCurrencyList.form
deleted file mode 100755
index e61595ff4017fb3a2082d29e7109f4202e63fc34..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/CurrencyModule_viewCurrencyList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Currency List</title>
-  <row_length>4</row_length>
-  <name>CurrencyModule_viewCurrencyList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('title', 'Title')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Currency', 'Currency')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">1</select>
-          <selection_name>currency_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Currency Listbox</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Currency_view.form b/product/ERP5/skins/erp5_accounting/Currency_view.form
deleted file mode 100755
index f26e6c85e88bd1f22be531d4113a860773d4a555..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Currency_view.form
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Currency</title>
-  <row_length>4</row_length>
-  <name>Currency_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>ID</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Entity_viewAccountingTransactionList.form b/product/ERP5/skins/erp5_accounting/Entity_viewAccountingTransactionList.form
deleted file mode 100755
index f27c2d83975bc179d46e58c1f75b52608b8e895a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Entity_viewAccountingTransactionList.form
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Transactions</title>
-  <row_length>4</row_length>
-  <name>Entity_viewAccountingTransactionList</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('Title', 'Title'), ('default_source_section_title', 'Section'), ('getStopDate', 'Date'), ('Type', 'Type'), ('reference', 'Invoice Number'), ('simulation_state', 'State'), ('source_debit', 'Debit'), ('source_credit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[('portal_categories/group', 'Group'), ('portal_categories/region', 'Region')]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">25</lines>
-          <list_action>Base_jumpToAccountingTransaction?from_entity=1</list_action>
-          <list_method type="method">Entity_zGetAccountingTransactionList</list_method>
-          <meta_types type="list">[]</meta_types>
-          <not_viewable type="int">0</not_viewable>
-          <portal_types type="list">[('Accounting Transaction', 'Accounting Transaction'), ('Purchase Invoice Transaction', 'Purchase Invoice Transaction'), ('Sale Invoice Transaction', 'Sale Invoice Transaction'), ('Balance Transaction', 'Balance Transaction')]</portal_types>
-          <read_only type="int">0</read_only>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>entity_transaction_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns type="list">[('source_debit', 'Entity_statSourceDebit'), ('source_credit', 'Entity_statSourceCredit')]</stat_columns>
-          <stat_method></stat_method>
-          <title>Transactions related to this entity</title>
-          <url_columns type="list">[]</url_columns>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Entity_zGetAccountingTransactionList.zsql b/product/ERP5/skins/erp5_accounting/Entity_zGetAccountingTransactionList.zsql
deleted file mode 100755
index 53277bbc2186809da3ea4ec6e17e3074c30ef099..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Entity_zGetAccountingTransactionList.zsql
+++ /dev/null
@@ -1,90 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:ZSQLBrain
-class_file:zsqlbrain.py
-</dtml-comment>
-<params>getUid
-query
-omit_input
-omit_output
-resource_uid:list
-from_date
-to_date
-transaction_simulation_state:list
-transaction_section_category
-node_uid:list
-stat</params>
-<dtml-if getUid>
-SELECT
-<dtml-if stat>
-  SUM(stock.quantity) AS quantity
-<dtml-else>
-  DISTINCT catalog.*
-  , IFNULL(SUM(IF(stock.quantity > 0, stock.quantity, 0)), 0) AS source_credit
-  , IFNULL(SUM(IF(stock.quantity < 0, - stock.quantity, 0)), 0) AS source_debit
-</dtml-if>
-FROM
-  movement
-  , stock
-  , catalog AS child
-  , catalog
-  , catalog AS node
-  , category AS node_category
-<dtml-if query>
-  , category
-</dtml-if>
-WHERE stock.mirror_section_uid = <dtml-var getUid>
-  AND child.uid = stock.uid 
-  AND child.parent_uid = catalog.uid
-  AND movement.uid = stock.uid
-  AND movement.is_accountable = 1
-  AND node.uid = stock.node_uid
-  AND node.uid = node_category.uid
-  AND (node_category.category_uid = <dtml-sqlvar "portal_categories.account_type.asset.receivable.getUid()"  type="int">
-    OR node_category.category_uid = <dtml-sqlvar "portal_categories.account_type.liability.payable.getUid()"  type="int">
-  )
-<dtml-if node_uid>
-  AND (
-  <dtml-in node_uid>
-    stock.node_uid = <dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>
-  </dtml-in>
-  )
-</dtml-if>
-<dtml-if resource_uid>
-  AND (
-  <dtml-in resource_uid>
-    movement.resource_uid = <dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if>
-  </dtml-in>
-  )
-</dtml-if>
-<dtml-if from_date>
-  AND movement.stop_date >= <dtml-sqlvar from_date type="string">
-</dtml-if>
-<dtml-if to_date>
-  AND movement.stop_date < <dtml-sqlvar to_date type="string">
-</dtml-if>
-<dtml-if omit_input>
-  AND stock.quantity < 0
-</dtml-if>
-<dtml-if omit_output>
-  AND stock.quantity > 0
-</dtml-if>
-<dtml-if transaction_simulation_state>
-  AND (
-  <dtml-in transaction_simulation_state>
-    catalog.simulation_state = <dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else> OR </dtml-if>
-  </dtml-in>
-  )
-</dtml-if>
-<dtml-if query>
-  AND category.uid = stock.section_uid
-AND <dtml-var query>
-</dtml-if>
-<dtml-unless stat>
-GROUP BY catalog.uid
-</dtml-unless>
-</dtml-if>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Folder_addPurchaseInvoice.py b/product/ERP5/skins/erp5_accounting/Folder_addPurchaseInvoice.py
deleted file mode 100755
index f649aa0f0d3745273a05f23e84b7f23b7cef3d98..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Folder_addPurchaseInvoice.py
+++ /dev/null
@@ -1,34 +0,0 @@
-## Script (Python) "Folder_addPurchaseInvoice"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=folder, id
-##title=
-##
-product = container.manage_addProduct[ 'ERP5' ]
-
-product.addTransaction(id) 
-my_transaction = folder[id]
-
-product = my_transaction.manage_addProduct[ 'ERP5' ]
-
-context.portal_types.constructContent(type_name= 'Purchase Invoice Transaction Line',
-                           container=my_transaction,
-                           id='expense')
-context.portal_types.constructContent(type_name= 'Purchase Invoice Transaction Line',
-                           container=my_transaction,
-                           id='payable')
-context.portal_types.constructContent(type_name= 'Purchase Invoice Transaction Line',
-                           container=my_transaction,
-                           id='collected_vat')
-context.portal_types.constructContent(type_name= 'Purchase Invoice Transaction Line',
-                           container=my_transaction,
-                           id='refundable_vat')
-expense=my_transaction.expense
-payable=my_transaction.payable
-collected_vat=my_transaction.collected_vat
-refundable_vat=my_transaction.refundable_vat
-
-return my_transaction
diff --git a/product/ERP5/skins/erp5_accounting/Folder_addSaleInvoice.py b/product/ERP5/skins/erp5_accounting/Folder_addSaleInvoice.py
deleted file mode 100755
index 865ac8b450c7e5d3d7294a340a92da03c6567877..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Folder_addSaleInvoice.py
+++ /dev/null
@@ -1,30 +0,0 @@
-## Script (Python) "Folder_addSaleInvoice"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=folder, id
-##title=
-##
-product = container.manage_addProduct[ 'ERP5' ]
-
-product.addTransaction(id) 
-my_transaction = folder[id]
-
-product = my_transaction.manage_addProduct[ 'ERP5' ]
-
-context.portal_types.constructContent(type_name= 'Sale Invoice Transaction Line',
-                           container=my_transaction,
-                           id='income')
-context.portal_types.constructContent(type_name= 'Sale Invoice Transaction Line',
-                           container=my_transaction,
-                           id='receivable')
-context.portal_types.constructContent(type_name= 'Sale Invoice Transaction Line',
-                           container=my_transaction,
-                           id='collected_vat')
-income=my_transaction.income
-receivable=my_transaction.receivable
-collected_vat=my_transaction.collected_vat
-
-return my_transaction
diff --git a/product/ERP5/skins/erp5_accounting/InvoiceTransactionLine_getDestinationItemList.py b/product/ERP5/skins/erp5_accounting/InvoiceTransactionLine_getDestinationItemList.py
deleted file mode 100755
index e0364c7086d94fc511f35d04178df082c5c016ba..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/InvoiceTransactionLine_getDestinationItemList.py
+++ /dev/null
@@ -1,44 +0,0 @@
-## Script (Python) "InvoiceTransactionLine_getDestinationItemList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-from Products.ERP5Type.Cache import CachingMethod
-
-category_dict = {'income': 'portal_categories/account_type/expense',
-                 'expense': 'portal_categories/account_type/income',
-                 'payable': 'portal_categories/account_type/asset/receivable',
-                 'receivable': 'portal_categories/account_type/liability/payable',
-                 'collected_vat': 'portal_categories/account_type/asset/receivable/refundable_vat',
-                 'refundable_vat': 'portal_categories/account_type/liability/payable/collected_vat',
-                 'bank': 'portal_categories/account_type/asset/cash',
-                 }
-
-if context.id in category_dict:
-  category = category_dict[context.id]
-else:
-  category = 'portal_categories/account_type'
-
-display_dict = {}
-def display(x):
-  if x not in display_dict:
-    pcg_id = x.getPcgId()
-    account_title = x.getTitle()
-    display_dict[x] = "%s - %s" % (pcg_id, account_title)
-  return display_dict[x]
-
-def sort(x,y):
-  return cmp(display(x), display(y))
-
-def getItemList(category=None):
-  obj = context.restrictedTraverse(category)
-  item_list = obj.getCategoryMemberItemList(portal_type='Account', base=0,
-                                            display_method=display, sort_method=sort)
-  return item_list
-
-getItemList = CachingMethod(getItemList, id=('getInvoiceTransactionLineItemList', 'getItemList'))
-return getItemList(category=category)
diff --git a/product/ERP5/skins/erp5_accounting/InvoiceTransactionLine_getSourceItemList.py b/product/ERP5/skins/erp5_accounting/InvoiceTransactionLine_getSourceItemList.py
deleted file mode 100755
index eb69c1d1262cdbd84acaee65989478dac08f7bae..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/InvoiceTransactionLine_getSourceItemList.py
+++ /dev/null
@@ -1,44 +0,0 @@
-## Script (Python) "InvoiceTransactionLine_getSourceItemList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-from Products.ERP5Type.Cache import CachingMethod
-
-category_dict = {'income': 'portal_categories/account_type/income',
-                 'expense': 'portal_categories/account_type/expense',
-                 'payable': 'portal_categories/account_type/liability/payable',
-                 'receivable': 'portal_categories/account_type/asset/receivable',
-                 'collected_vat': 'portal_categories/account_type/liability/payable/collected_vat',
-                 'refundable_vat': 'portal_categories/account_type/asset/receivable/refundable_vat',
-                 'bank': 'portal_categories/account_type/asset/cash',
-                 }
-
-if context.id in category_dict:
-  category = category_dict[context.id]
-else:
-  category = 'portal_categories/account_type'
-
-display_dict = {}
-def display(x):
-  if x not in display_dict:
-    pcg_id = x.getPcgId()
-    account_title = x.getTitle()
-    display_dict[x] = "%s - %s" % (pcg_id, account_title)
-  return display_dict[x]
-
-def sort(x,y):
-  return cmp(display(x), display(y))
-
-def getItemList(category=None):
-  obj = context.restrictedTraverse(category)
-  item_list = obj.getCategoryMemberItemList(portal_type='Account', base=0,
-                                            display_method=display, sort_method=sort)
-  return item_list
-
-getItemList = CachingMethod(getItemList, id=('getInvoiceTransactionLineItemList', 'getItemList'))
-return getItemList(category=category)
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetLine_view.form b/product/ERP5/skins/erp5_accounting/PaySheetLine_view.form
deleted file mode 100755
index a619683e5cff4ca461d4efe35f24ae10592a191f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetLine_view.form
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Pay Sheet Line</title>
-  <row_length>4</row_length>
-  <name>pay_sheet_line_edit</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">1</required>
-          <title>ID</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">2</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_resource_relative_url</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>resource</base_category>
-          <catalog_index>relative_url</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>product</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <portal_type type="list">[('Service', 'Service'), ('Product', 'Product')]</portal_type>
-          <read_only type="int">0</read_only>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Produit</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_variation_base_category_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <size type="int">3</size>
-          <title>Axes variation</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-          <items>here/getVariationRangeBaseCategoryList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_variation_category_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <size type="int">8</size>
-          <title>Variantes</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-          <items>here/getVariationRangeCategoryItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Default quantity</title>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity_unit</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Quantity unit</title>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/quantity_unit/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Default price</title>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_total_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Invoiced Quantity</title>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <title>python:'Invoice Quantity : %.2f' % here.getTotalQuantity()</title>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetLine_viewQuantity.form b/product/ERP5/skins/erp5_accounting/PaySheetLine_viewQuantity.form
deleted file mode 100755
index 48d7624053a50a53a8b59f02be825d60928b0508..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetLine_viewQuantity.form
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title></title>
-  <row_length>4</row_length>
-  <name>pay_sheet_line_quantity_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">1</required>
-          <title>ID</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>matrixbox</id> <type>MatrixBox</type>
-        <values>
-          <all_editable_attributes type="list">[('quantity', 'quantity'), ('price', 'price'), ('predicate_value', 'predicate_value'), ('variation_category_list', 'variation_category_list')]</all_editable_attributes>
-          <alternate_name></alternate_name>
-          <cell_base_id>cell</cell_base_id>
-          <columns type="list">[('None', 'None')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_attributes type="list">[('quantity', 'quantity'), ('predicate_value', 'predicate_value'), ('price', 'price'), ('variation_category_list', 'variation_category_list')]</editable_attributes>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <getter_method></getter_method>
-          <global_attributes type="list">[('domain_base_category_list', 'domain_base_category_list'), ('mapped_value_property_list', 'mapped_value_property_list'), ('predicate_operator', 'predicate_operator')]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="list">[('None', 'None')]</lines>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <tabs type="list">[]</tabs>
-          <title>matrixbox</title>
-          <update_cell_range type="int">1</update_cell_range>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-          <columns>python:here.OrderLine_getMatrixItemlist(base_category_list = ('salary_range', 'taille',), base=1)</columns>
-          <lines>python:here.OrderLine_getMatrixItemlist(base_category_list = ('tax_category', 'coloris','variante'), base=1)</lines>
-          <tabs>python:here.OrderLine_getMatrixItemlist(base_category_list = ('salary_range','tax_category', 'taille','coloris','variante'), base=1, include=0)</tabs>
-          <update_cell_range>here/DeliveryLine_asCellRange</update_cell_range>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      <field><id>domain_base_category_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Valid Domain</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>here/getVariationBaseCategoryList</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>predicate_operator</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>SUPERSET_OF</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Operator</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>mapped_value_property_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">["['target_quantity', 'quantity', 'price']"]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Modified categories</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>matrixbox_predicate_value</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>matrixbox_predicate_value</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>python:cell_index</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox_variation_category_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>matrixbox_predicate_value</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>python:cell_index</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>matrixbox_price</title>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:cell.getProperty('price')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission></editable_permission>
-          <editable_role></editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>matrixbox_quantity</title>
-          <viewable_expression></viewable_expression>
-          <viewable_permission></viewable_permission>
-          <viewable_role></viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:cell.getProperty('quantity')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransactionLine_view.form b/product/ERP5/skins/erp5_accounting/PaySheetTransactionLine_view.form
deleted file mode 100755
index 0fde66328c82ef0392754a2ddfa74ea0018fc3e1..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransactionLine_view.form
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Invoice Transaction Line</title>
-  <row_length>4</row_length>
-  <name>purchase_invoice_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Customer Account</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:here.InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Vendor Account</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:here.InvoiceTransactionLine_getDestinationItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Source Credit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Source Debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_calcul_OLD.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_calcul_OLD.py
deleted file mode 100755
index 20d0e0c78f3d24fcfaae331e9a26551215190c7e..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_calcul_OLD.py
+++ /dev/null
@@ -1,538 +0,0 @@
-## Script (Python) "PaySheetTransaction_calcul_OLD"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=agff_slice_1_base=None, agff_slice_1_er=None, agff_slice_1_sr=None, agff_slice_2_base=None, agff_slice_2_er=None, agff_slice_2_sr=None, agff_slice_a_base=None, agff_slice_a_er=None, agff_slice_a_sr=None, agff_slice_b_base=None, agff_slice_b_er=None, agff_slice_b_sr=None, agirc_slice_b_base=None, agirc_slice_b_er=None, agirc_slice_b_sr=None, agirc_slice_c_base=None, agirc_slice_c_er=None, agirc_slice_c_sr=None, ags_slice_a_base=None, ags_slice_a_er=None, ags_slice_b_base=None, ags_slice_b_er=None, apec_slice_b_base=None, apec_slice_b_er=None, apec_slice_b_sr=None, arrco_slice_1_base=None, arrco_slice_1_er=None, arrco_slice_1_sr=None, arrco_slice_2_base=None, arrco_slice_2_er=None, arrco_slice_2_sr=None, arrco_slice_a_base=None, arrco_slice_a_er=None, arrco_slice_a_sr=None, cet_slice_a_base=None, cet_slice_a_er=None, cet_slice_a_sr=None, cet_slice_b_base=None, cet_slice_b_er=None, cet_slice_b_sr=None, cet_slice_c_base=None, cet_slice_c_er=None, cet_slice_c_sr=None, construction_tax_base=None, construction_tax_er=None, courses_tax_base=None, courses_tax_er=None, crds_base=None, crds_sr=None, csg_deductible_base=None, csg_deductible_sr=None, csg_non_deductible_base=None, csg_non_deductible_sr=None, family_benefits_base=None, family_benefits_er=None, industrial_accident_base=None, industrial_accident_er=None, life_insurance_slice_a_base=None, life_insurance_slice_a_er=None, lodging_helps_base=None, lodging_helps_er=None, lodging_helps_limited_base=None, lodging_helps_limited_er=None, oldage_insurance_base=None, oldage_insurance_er=None, oldage_insurance_limited_base=None, oldage_insurance_limited_er=None, oldage_insurance_limited_sr=None, sickness_insurance_base=None, sickness_insurance_er=None, sickness_insurance_sr=None, syntec_base=None, syntec_er=None, syntec_sr=None, training_tax_base=None, training_tax_er=None, transport_payment_base=None, transport_payment_er=None, unemployment_insurance_slice_a_base=None, unemployment_insurance_slice_a_er=None, unemployment_insurance_slice_a_sr=None, unemployment_insurance_slice_b_base=None, unemployment_insurance_slice_b_er=None, unemployment_insurance_slice_b_sr=None, widowhood_insurance_base=None, widowhood_insurance_sr=None
-##title=
-##
-True  = 1
-False = 0
-
-global paysheet
-paysheet           = context.getObject()
-paysheet_type      = paysheet.getPortalType()
-
-paysheet_line_type = 'Pay Sheet Line'
-paysheet_cell_type = 'Pay Sheet Cell'
-
-employee            = paysheet.getDestinationSection()
-employee_object     = paysheet.getDestinationSectionValue()
-employer            = paysheet.getSourceSection()
-employer_object     = paysheet.getSourceSectionValue()
-
-gross_salary = abs(paysheet.getGrossSalary())
-#paysheet_resource = paysheet.getCurrency()   why it doesn't work ?????
-paysheet_resource = 'currency/EUR'
-
-
-
-# set the title if empty
-months = ['janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre']
-if paysheet.getTitle() in ('', None):
-    paysheet.setTitle('Salaire ' + str(employee_object.getTitle()) + ' ' + months[int(str(paysheet.getStartDate())[5:7])-1] + ' ' + str(paysheet.getStartDate())[0:4])
-
-
-
-#########################################################################
-# This part of the script implement functions to register all pay sheet
-# informations from an ERP5 point of view.
-#########################################################################
-
-def createPaySheetItem(title='', res='', dest_org='', cells=[]):
-    global paysheet
-    # select good cells only
-    good_cells = []
-    for cell in cells:
-        if cell["base"] not in ('', 0, None) and cell["rate"] not in ('', 0, None):
-            good_cells.append(cell)
-    if len(good_cells) == 0:
-        return
-    # get all variation categories used in cells
-    var_cat_list = []
-    for cell in good_cells:
-        var_cat_list.append(cell["x"])
-        var_cat_list.append(cell["y"])
-    # add a new Pay Sheet Line
-    payline = paysheet.newContent( portal_type                  = 'Pay Sheet Line'
-                                 , title                        = title
-                                 , resource                     = res
-                                 , destination_section          = dest_org
-                                 , destination                  = dest_org
-                                 , variation_base_category_list = ('tax_category', 'salary_range')
-                                 , variation_category_list      = var_cat_list
-                                 )
-    # fill each cell with values
-    for cell in good_cells:
-        paycell = payline.getCell(cell["x"], cell["y"], base_id = 'movement')
-        paycell.edit(quantity=-cell["base"], price=cell["rate"]/100.0)
-
-
-
-#########################################################################
-# This part of script describe the behaviour of the calculation process
-# from accountant point of view.
-#########################################################################
-
-# social organism
-org_urssaf  = 'organisation/urssaf'
-org_assedic = 'organisation/assedic'
-org_arrco   = 'organisation/arrco'
-org_agff    = 'organisation/agff'
-org_agirc   = 'organisation/agirc'
-org_apec    = 'organisation/apec'
-org_etat    = 'organisation/etat'
-org_ener    = 'organisation/henner'
-
-# variation categories
-cat_social_salary_share                     = 'tax_category/social/salary_share'
-cat_social_employer_share                   = 'tax_category/social/employer_share'
-cat_syntec_employer_share                   = 'tax_category/syntec_insurance/employer_share'
-cat_syntec_salary_share                     = 'tax_category/syntec_insurance/salary_share'
-cat_csg                                     = 'tax_category/csg/salary_share'
-cat_crds                                    = 'tax_category/crds/salary_share'
-cat_unemployment_salary_share               = 'tax_category/unemployment/salary_share'
-cat_unemployment_employer_share             = 'tax_category/unemployment/employer_share'
-cat_ags                                     = 'tax_category/ags/employer_share'
-cat_supplementary_pension_salary_share      = 'tax_category/supplementary_pension/salary_share'
-cat_supplementary_pension_employer_share    = 'tax_category/supplementary_pension/employer_share'
-cat_life_insurance_employer_share           = 'tax_category/life_insurance/employer_share'
-cat_apec_salary_share                       = 'tax_category/apec/salary_share'
-cat_apec_employer_share                     = 'tax_category/apec/employer_share'
-cat_taxes                                   = 'tax_category/taxes/employer_share'
-cat_gross_salary                            = 'salary_range/france/salaire_brut'
-cat_limited_salary                          = 'salary_range/france/salaire_plafonne'
-cat_syntec_limited_salary                   = 'salary_range/france/salaire_plafonne_syntec'
-cat_brut_csg_salary                         = 'salary_range/france/salaire_brut_csg'
-cat_brut_crds_salary                        = 'salary_range/france/salaire_brut_crds'
-cat_slice_a                                 = 'salary_range/france/tranche_a'
-cat_slice_b                                 = 'salary_range/france/tranche_b'
-cat_slice_c                                 = 'salary_range/france/tranche_c'
-cat_slice_1                                 = 'salary_range/france/tranche_1'
-cat_slice_2                                 = 'salary_range/france/tranche_2'
-
-
-# sickness insurance = assurance maladie
-createPaySheetItem( title       = 'Assurance maladie'
-                  , res         = 'service/sickness_insurance'
-                  , dest_org    = org_urssaf
-                  , cells       =   [   { "x"       : cat_social_salary_share
-                                        , "y"       : cat_gross_salary
-                                        , "base"    : sickness_insurance_base
-                                        , "rate"    : sickness_insurance_sr
-                                        },
-                                        { "x"       : cat_social_employer_share
-                                        , "y"       : cat_gross_salary
-                                        , "base"    : sickness_insurance_base
-                                        , "rate"    : sickness_insurance_er
-                                        }
-                                    ]
-                  )
-
-# old-age insurance = assurance vieillesse
-createPaySheetItem( title       = 'Assurance vieillesse'
-                  , res         = 'service/oldage_insurance'
-                  , dest_org    = org_urssaf
-                  , cells       =   [   { "x"       : cat_social_salary_share
-                                        , "y"       : cat_limited_salary
-                                        , "base"    : oldage_insurance_limited_base
-                                        , "rate"    : oldage_insurance_limited_sr
-                                        },
-                                        { "x"       : cat_social_employer_share
-                                        , "y"       : cat_gross_salary
-                                        , "base"    : oldage_insurance_base
-                                        , "rate"    : oldage_insurance_er
-                                        },
-                                        { "x"       : cat_social_employer_share
-                                        , "y"       : cat_limited_salary
-                                        , "base"    : oldage_insurance_limited_base
-                                        , "rate"    : oldage_insurance_limited_er
-                                        }
-                                    ]
-                  )
-
-# widowhood insurance = assurance veuvage
-createPaySheetItem( title       = 'Assurance veuvage'
-                  , res         = 'service/widowhood_insurance'
-                  , dest_org    = org_urssaf
-                  , cells       =   [   { "x"       : cat_social_salary_share
-                                        , "y"       : cat_gross_salary
-                                        , "base"    : widowhood_insurance_base
-                                        , "rate"    : widowhood_insurance_sr
-                                        }
-                                    ]
-                  )
-
-# family benefits = allocations familiales
-createPaySheetItem( title       = 'Allocations familiales'
-                  , res         = 'service/family_benefits'
-                  , dest_org    = org_urssaf
-                  , cells       =   [   { "x"       : cat_social_employer_share
-                                        , "y"       : cat_gross_salary
-                                        , "base"    : family_benefits_base
-                                        , "rate"    : family_benefits_er
-                                        }
-                                    ]
-                  )
-
-# industrial accident = accidents du travail
-createPaySheetItem( title       = 'Accidents du travail'
-                  , res         = 'service/industrial_accident'
-                  , dest_org    = org_urssaf
-                  , cells       =   [   { "x"       : cat_social_employer_share
-                                        , "y"       : cat_gross_salary
-                                        , "base"    : industrial_accident_base
-                                        , "rate"    : industrial_accident_er
-                                        }
-                                    ]
-                  )
-
-# lodging helps = aide au logement
-createPaySheetItem( title       = 'Aide au logement'
-                  , res         = 'service/lodging_helps'
-                  , dest_org    = org_urssaf
-                  , cells       =   [   { "x"       : cat_social_employer_share
-                                        , "y"       : cat_gross_salary
-                                        , "base"    : lodging_helps_base
-                                        , "rate"    : lodging_helps_er
-                                        },
-                                        { "x"       : cat_social_employer_share
-                                        , "y"       : cat_limited_salary
-                                        , "base"    : lodging_helps_limited_base
-                                        , "rate"    : lodging_helps_limited_er
-                                        }
-                                    ]
-                  )
-
-# transport payment = versement au transport
-createPaySheetItem( title       = 'Versement au transport'
-                  , res         = 'service/transport_payment'
-                  , dest_org    = org_urssaf
-                  , cells       =   [   { "x"       : cat_social_employer_share
-                                        , "y"       : cat_gross_salary
-                                        , "base"    : transport_payment_base
-                                        , "rate"    : transport_payment_er
-                                        }
-                                    ]
-                  )
-
-# CSG = Contribution Sociale Generalisee (déductible / non déductible)
-createPaySheetItem( title       = 'CSG deductible'
-                  , res         = 'service/csg_deductible'
-                  , dest_org    = org_urssaf
-                  , cells       =   [   { "x"       : cat_csg
-                                        , "y"       : cat_brut_csg_salary
-                                        , "base"    : csg_deductible_base
-                                        , "rate"    : csg_deductible_sr
-                                        }
-                                    ]
-                  )
-createPaySheetItem( title       = 'CSG non deductible'
-                  , res         = 'service/csg_non_deductible'
-                  , dest_org    = org_urssaf
-                  , cells       =   [   { "x"       : cat_csg
-                                        , "y"       : cat_brut_csg_salary
-                                        , "base"    : csg_non_deductible_base
-                                        , "rate"    : csg_non_deductible_sr
-                                        }
-                                    ]
-                  )
-
-# CRDS = Contribution pour le Remboursement de la Dette Sociale
-createPaySheetItem( title       = 'CRDS imposable'
-                  , res         = 'service/crds'
-                  , dest_org    = org_urssaf
-                  , cells       =   [   { "x"       : cat_crds
-                                        , "y"       : cat_brut_crds_salary
-                                        , "base"    : crds_base
-                                        , "rate"    : crds_sr
-                                        }
-                                    ]
-                  )
-
-# unemployment insurance = assurance chomage
-createPaySheetItem( title       = 'Assurance chomage'
-                  , res         = 'service/unemployment_insurance'
-                  , dest_org    = org_assedic
-                  , cells       =   [   { "x"       : cat_unemployment_salary_share
-                                        , "y"       : cat_slice_a
-                                        , "base"    : unemployment_insurance_slice_a_base
-                                        , "rate"    : unemployment_insurance_slice_a_sr
-                                        },
-                                        { "x"       : cat_unemployment_employer_share
-                                        , "y"       : cat_slice_a
-                                        , "base"    : unemployment_insurance_slice_a_base
-                                        , "rate"    : unemployment_insurance_slice_a_er
-                                        },
-                                        { "x"       : cat_unemployment_salary_share
-                                        , "y"       : cat_slice_b
-                                        , "base"    : unemployment_insurance_slice_b_base
-                                        , "rate"    : unemployment_insurance_slice_b_sr
-                                        },
-                                        { "x"       : cat_unemployment_employer_share
-                                        , "y"       : cat_slice_b
-                                        , "base"    : unemployment_insurance_slice_b_base
-                                        , "rate"    : unemployment_insurance_slice_b_er
-                                        }
-                                    ]
-                  )
-
-# AGS (FNGS)
-createPaySheetItem( title       = 'AGS'
-                  , res         = 'service/ags'
-                  , dest_org    = org_assedic
-                  , cells       =   [   { "x"       : cat_ags
-                                        , "y"       : cat_slice_a
-                                        , "base"    : ags_slice_a_base
-                                        , "rate"    : ags_slice_a_er
-                                        },
-                                        { "x"       : cat_ags
-                                        , "y"       : cat_slice_b
-                                        , "base"    : ags_slice_b_base
-                                        , "rate"    : ags_slice_b_er
-                                        }
-                                    ]
-                  )
-
-# ARRCO
-createPaySheetItem( title       = 'ARRCO'
-                  , res         = 'service/arrco'
-                  , dest_org    = org_arrco
-                  , cells       =   [   { "x"       : cat_supplementary_pension_salary_share
-                                        , "y"       : cat_slice_1
-                                        , "base"    : arrco_slice_1_base
-                                        , "rate"    : arrco_slice_1_sr
-                                        },
-                                        { "x"       : cat_supplementary_pension_employer_share
-                                        , "y"       : cat_slice_1
-                                        , "base"    : arrco_slice_1_base
-                                        , "rate"    : arrco_slice_1_er
-                                        },
-                                        { "x"       : cat_supplementary_pension_salary_share
-                                        , "y"       : cat_slice_2
-                                        , "base"    : arrco_slice_2_base
-                                        , "rate"    : arrco_slice_2_sr
-                                        },
-                                        { "x"       : cat_supplementary_pension_employer_share
-                                        , "y"       : cat_slice_2
-                                        , "base"    : arrco_slice_2_base
-                                        , "rate"    : arrco_slice_1_er
-                                        },
-                                        { "x"       : cat_supplementary_pension_salary_share
-                                        , "y"       : cat_slice_a
-                                        , "base"    : arrco_slice_a_base
-                                        , "rate"    : arrco_slice_a_sr
-                                        },
-                                        { "x"       : cat_supplementary_pension_employer_share
-                                        , "y"       : cat_slice_a
-                                        , "base"    : arrco_slice_a_base
-                                        , "rate"    : arrco_slice_a_er
-                                        }
-                                    ]
-                  )
-
-# AGFF
-createPaySheetItem( title       = 'AGFF'
-                  , res         = 'service/agff'
-                  , dest_org    = org_agff
-                  , cells       =   [   { "x"       : cat_supplementary_pension_salary_share
-                                        , "y"       : cat_slice_1
-                                        , "base"    : agff_slice_1_base
-                                        , "rate"    : agff_slice_1_sr
-                                        },
-                                        { "x"       : cat_supplementary_pension_employer_share
-                                        , "y"       : cat_slice_1
-                                        , "base"    : agff_slice_1_base
-                                        , "rate"    : agff_slice_1_er
-                                        },
-                                        { "x"       : cat_supplementary_pension_salary_share
-                                        , "y"       : cat_slice_2
-                                        , "base"    : agff_slice_2_base
-                                        , "rate"    : agff_slice_2_sr
-                                        },
-                                        { "x"       : cat_supplementary_pension_employer_share
-                                        , "y"       : cat_slice_2
-                                        , "base"    : agff_slice_2_base
-                                        , "rate"    : agff_slice_2_er
-                                        },
-                                        { "x"       : cat_supplementary_pension_salary_share
-                                        , "y"       : cat_slice_a
-                                        , "base"    : agff_slice_a_base
-                                        , "rate"    : agff_slice_a_sr
-                                        },
-                                        { "x"       : cat_supplementary_pension_employer_share
-                                        , "y"       : cat_slice_a
-                                        , "base"    : agff_slice_a_base
-                                        , "rate"    : agff_slice_a_er
-                                        },
-                                        { "x"       : cat_supplementary_pension_salary_share
-                                        , "y"       : cat_slice_b
-                                        , "base"    : agff_slice_b_base
-                                        , "rate"    : agff_slice_b_sr
-                                        },
-                                        { "x"       : cat_supplementary_pension_employer_share
-                                        , "y"       : cat_slice_b
-                                        , "base"    : agff_slice_b_base
-                                        , "rate"    : agff_slice_b_er
-                                        }
-                                    ]
-                  )
-
-# AGIRC
-createPaySheetItem( title       = 'AGIRC'
-                  , res         = 'service/agirc'
-                  , dest_org    = org_agirc
-                  , cells       =   [   { "x"       : cat_supplementary_pension_salary_share
-                                        , "y"       : cat_slice_b
-                                        , "base"    : agirc_slice_b_base
-                                        , "rate"    : agirc_slice_b_sr
-                                        },
-                                        { "x"       : cat_supplementary_pension_employer_share
-                                        , "y"       : cat_slice_b
-                                        , "base"    : agirc_slice_b_base
-                                        , "rate"    : agirc_slice_b_er
-                                        },
-                                        { "x"       : cat_supplementary_pension_salary_share
-                                        , "y"       : cat_slice_c
-                                        , "base"    : agirc_slice_c_base
-                                        , "rate"    : agirc_slice_c_sr
-                                        },
-                                        { "x"       : cat_supplementary_pension_employer_share
-                                        , "y"       : cat_slice_c
-                                        , "base"    : agirc_slice_c_base
-                                        , "rate"    : agirc_slice_c_er
-                                        }
-                                    ]
-                  )
-
-# CET
-createPaySheetItem( title       = 'CET'
-                  , res         = 'service/cet'
-                  , dest_org    = org_agirc
-                  , cells       =   [   { "x"       : cat_supplementary_pension_salary_share
-                                        , "y"       : cat_slice_a
-                                        , "base"    : cet_slice_a_base
-                                        , "rate"    : cet_slice_a_sr
-                                        },
-                                        { "x"       : cat_supplementary_pension_employer_share
-                                        , "y"       : cat_slice_a
-                                        , "base"    : cet_slice_a_base
-                                        , "rate"    : cet_slice_a_er
-                                        },
-                                        { "x"       : cat_supplementary_pension_salary_share
-                                        , "y"       : cat_slice_b
-                                        , "base"    : cet_slice_b_base
-                                        , "rate"    : cet_slice_b_sr
-                                        },
-                                        { "x"       : cat_supplementary_pension_employer_share
-                                        , "y"       : cat_slice_b
-                                        , "base"    : cet_slice_b_base
-                                        , "rate"    : cet_slice_b_er
-                                        },
-                                        { "x"       : cat_supplementary_pension_salary_share
-                                        , "y"       : cat_slice_c
-                                        , "base"    : cet_slice_c_base
-                                        , "rate"    : cet_slice_c_sr
-                                        },
-                                        { "x"       : cat_supplementary_pension_employer_share
-                                        , "y"       : cat_slice_c
-                                        , "base"    : cet_slice_c_base
-                                        , "rate"    : cet_slice_c_er
-                                        }
-                                    ]
-                  )
-
-# life insurance = assurance deces
-createPaySheetItem( title       = 'Assurance deces'
-                  , res         = 'service/life_insurance'
-                  , dest_org    = org_urssaf
-                  , cells       =   [   { "x"       : cat_life_insurance_employer_share
-                                        , "y"       : cat_slice_a
-                                        , "base"    : life_insurance_slice_a_base
-                                        , "rate"    : life_insurance_slice_a_er
-                                        }
-                                    ]
-                  )
-
-# APEC
-createPaySheetItem( title       = 'APEC'
-                  , res         = 'service/apec'
-                  , dest_org    = org_apec
-                  , cells       =   [   { "x"       : cat_apec_salary_share
-                                        , "y"       : cat_slice_b
-                                        , "base"    : apec_slice_b_base
-                                        , "rate"    : apec_slice_b_sr
-                                        },
-                                        { "x"       : cat_apec_employer_share
-                                        , "y"       : cat_slice_b
-                                        , "base"    : apec_slice_b_base
-                                        , "rate"    : apec_slice_b_er
-                                        }
-                                    ]
-                  )
-
-# construction tax
-createPaySheetItem( title       = 'Construction'
-                  , res         = 'service/construction'
-                  , dest_org    = org_etat
-                  , cells       =   [   { "x"       : cat_taxes
-                                        , "y"       : cat_gross_salary
-                                        , "base"    : construction_tax_base
-                                        , "rate"    : construction_tax_er
-                                        }
-                                    ]
-                  )
-
-# training tax
-createPaySheetItem( title       = 'Apprentissage'
-                  , res         = 'service/training_tax'
-                  , dest_org    = org_etat
-                  , cells       =   [   { "x"       : cat_taxes
-                                        , "y"       : cat_gross_salary
-                                        , "base"    : training_tax_base
-                                        , "rate"    : training_tax_er
-                                        }
-                                    ]
-                  )
-
-# courses tax
-createPaySheetItem( title       = 'Formation professionnelle'
-                  , res         = 'service/courses_tax'
-                  , dest_org    = org_etat
-                  , cells       =   [   { "x"       : cat_taxes
-                                        , "y"       : cat_gross_salary
-                                        , "base"    : courses_tax_base
-                                        , "rate"    : courses_tax_er
-                                        }
-                                    ]
-                  )
-
-# Syntec convention
-createPaySheetItem( title       = 'Convention SYNTEC'
-                  , res         = 'service/syntec_insurance'
-                  , dest_org    = org_ener
-                  , cells       =   [   { "x"       : cat_syntec_salary_share
-                                        , "y"       : cat_syntec_limited_salary
-                                        , "base"    : syntec_base
-                                        , "rate"    : syntec_sr
-                                        },
-                                        { "x"       : cat_syntec_employer_share
-                                        , "y"       : cat_syntec_limited_salary
-                                        , "base"    : syntec_base
-                                        , "rate"    : syntec_er
-                                        }
-                                    ]
-                  )
-
-
-
-#########################################################################
-# Create all Pay sheet transaction lines
-#########################################################################
-
-#get_transaction().commit()
-#context.PaySheetTransaction_generatePaySheetTransactionLineList()
-
-# return to pay sheet
-return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '?portal_status_message=Pay+Sheet+Calculation+done.')
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_calculate.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_calculate.py
deleted file mode 100755
index 89a6c6c5799f2796aa21c8a44168fe1da15fdc30..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_calculate.py
+++ /dev/null
@@ -1,514 +0,0 @@
-## Script (Python) "PaySheetTransaction_calculate"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# TODO: "#!!!" style comment
-# o replace etat by right organism
-
-True  = 1
-False = 0
-
-pay_sheet           = context.getObject()
-pay_sheet_type      = pay_sheet.getPortalType()
-pay_sheet_line_type = pay_sheet_type + ' Line'
-employee            = pay_sheet.getDestinationSection()
-employer            = pay_sheet.getSourceSection()
-employer_object     = pay_sheet.getSourceSectionValue()
-
-# social organism
-org_urssaf  = 'organisation/urssaf'
-org_assedic = 'organisation/assedic'
-org_arrco   = 'organisation/arrco'
-org_agff    = 'organisation/agff'
-org_agirc   = 'organisation/agirc'
-org_apec    = 'organisation/apec'
-org_etat    = 'organisation/etat'
-
-# gross salary source and destination
-charge_salariale = 'account/charges_salariales'
-produit_salarial = 'account/produits_salariales'
-
-# final salary source and destination
-dette_salarie   = 'account/dettes_salaries'
-creance_salarie = 'account/creances_salaries'
-
-# employer share source and destination
-charge_sociale = 'account/charges_sociales'
-produit_social = 'account/produits_sociaux'
-
-# employer + employee share source and destination
-dette_sociale   = 'account/dettes_sociales'
-creance_sociale = 'account/creances_sociales'
-
-
-
-### get the gross salary and other basic informations to calculate the paysheet
-
-gross_salary = abs(pay_sheet.getGrossSalary())
-#pay_sheet_resource = pay_sheet.getCurrency()   why it doesn't work ?????
-pay_sheet_resource = 'currency/EUR'
-
-global salary_share_total
-salary_share_total = 0.0
-
-executive = True                      ################### #!!! dynamic get
-
-company_birth = DateTime(2000, 10, 21)
-
-employer_region = employer_object.getDefaultAddress().getZipCode()[:2]
-
-sub_list = employer_object.getSubordinationRelatedValueList()
-company_size = 0
-for person in sub_list:
-  if person.getPortalType() == 'Person':
-    company_size += 1
-
-company_size = 3
-
-### define some parameters for the calculation
-
-# ceiling salary
-if gross_salary < 2432:     #!!! depending of the wage periodicity, 2432 euros is for a month
-  ceiling_salary = gross_salary
-else:
-  ceiling_salary = 2432
-
-# "Char" slice type
-if gross_salary <= 2432:
-  char_slice = 'A'
-elif gross_salary <= 9728:
-  char_slice = 'B'
-elif gross_salary <= 19456:
-  char_slice = 'C'
-else:
-  char_slice = ''
-
-# "Number" slice type
-if gross_salary <= 2432:
-  num_slice = 1
-elif gross_salary <= 7296:
-  num_slice = 2
-else:
-  num_slice = 0
-
-# age-slice of the company
-old_limit = DateTime(1997, 1, 1)
-if company_birth < old_limit:
-  comp_type = 'old'
-else:
-  comp_type = 'new'
-
-
-
-### create a new pay sheet line
-def createPaySheetLine(new_id='', new_title='', share='',
-                       src_sec='', src='', src_deb=None,
-                       dest_sec='', dest='', new_desc=''):
-
-  suffix = {'cs': '',
-            'pp': ' (part patronale)'}
-  if share == 'pp' or share == 'cs':
-    new_id = string.replace(string.lower(new_title), ' ', '_')
-    new_id += '_' + share
-    #new_title = string.replace(new_title, '?', 'e')
-    #new_title = string.replace(new_title, '?', 'e')
-    #new_title = string.replace(new_title, '?', 'o')
-    new_title += suffix[share]
-    if share == 'cs':
-      src_sec  = employer
-      src      = dette_sociale
-      dest     = creance_sociale
-    elif share == 'pp':
-      src_sec  = employer
-      src      = charge_sociale
-      dest     = produit_social
-  #if wrong ID (existing or wrong name): new_id = str(pay_sheet.generateNewId())
-  context.portal_types.constructContent(type_name = pay_sheet_line_type,
-                                        container = pay_sheet,
-                                        id        = new_id)
-  pay_sheet[new_id].setTitle(new_title)
-  pay_sheet[new_id].setResource(pay_sheet_resource)  # default currency
-  pay_sheet[new_id].setSourceSection(src_sec)
-  pay_sheet[new_id].setSource(src)
-  pay_sheet[new_id].setDestinationSection(dest_sec)
-  pay_sheet[new_id].setDestination(dest)
-  pay_sheet[new_id].setSourceDebit(src_deb)
-  pay_sheet[new_id].setSourceDebit(src_deb)
-  pay_sheet[new_id].setDescription(new_desc)
-
-
-
-### add a pay sheet item and manage the accounting writing rules
-def addPaySheetItem(title='', values={'salary_share_rate':None, 'employer_share_rate':None, 'base_value':None, 'base_description':None}, dest_org=''):
-    global salary_share_total
-    salary_share_value = None
-    employer_share_value = None
-    ps_description = None
-    pp_description = None
-    if values['salary_share_rate']!=None and values['base_value']!=None:
-        salary_share_value = (float(values['salary_share_rate']) / 100) * values['base_value']
-        ps_description = "= " + str(values['salary_share_rate']) + "% * " + str(values['base_value']) + " (=" + str(values['base_description']) + ")"
-    if values['employer_share_rate']!=None and values['base_value']!=None:
-        employer_share_value = (float(values['employer_share_rate']) / 100) * values['base_value']
-        pp_description = "= " + str(values['employer_share_rate']) + "% * " + str(values['base_value']) + " (=" + str(values['base_description']) + ")"
-    if salary_share_value == None and employer_share_value == None:
-        return
-    if salary_share_value != None:
-        salary_share_total += float(salary_share_value)
-    if employer_share_value == None:
-        createPaySheetLine( new_title = title,
-                            share     = 'cs',
-                            src_deb   = salary_share_value,
-                            dest_sec  = dest_org,
-                            new_desc  = ps_description)
-        return
-    if salary_share_value == None:
-        createPaySheetLine( new_title = title,
-                            share     = 'cs',
-                            src_deb   = employer_share_value,
-                            dest_sec  = dest_org,
-                            new_desc  = ps_description)
-        createPaySheetLine( new_title = title,
-                            share     = 'pp',
-                            src_deb   = employer_share_value,
-                            dest_sec  = dest_org,
-                            new_desc  = pp_description)
-        return
-    createPaySheetLine( new_title = title,
-                        share     = 'cs',
-                        src_deb   = float(employer_share_value) + float(salary_share_value),
-                        dest_sec  = dest_org,
-                        new_desc  = ps_description)
-    createPaySheetLine( new_title = title,
-                        share     = 'pp',
-                        src_deb   = employer_share_value,
-                        dest_sec  = dest_org,
-                        new_desc  = pp_description)
-
-
-
-### add the gross salary Pay Sheet Line
-createPaySheetLine( new_id      = 'gs',
-                    new_title   = 'Salaire brut',
-                    src_sec     = employer,
-                    src         = charge_salariale,
-                    src_deb     = gross_salary,
-                    dest_sec    = employee,
-                    dest        = produit_salarial)
-
-
-
-### Social Security
-# sickness insurance
-sickness_insurance =    { 'salary_share_rate'   : None
-                        , 'employer_share_rate' : 12.80
-                        , 'base_value'          : gross_salary
-                        , 'base_description'    : "salaire brut"
-                        }
-if employer_region == '57' or employer_region == '67' or employer_region == '68':
-    sickness_insurance['salary_share_rate'] = 1.70
-else:
-    sickness_insurance['salary_share_rate'] = 0.75
-addPaySheetItem(title       = 'Assurance maladie',
-                values      = sickness_insurance,
-                dest_org    = org_urssaf)
-
-# old-age insurance
-# this contribution is special because salary and employer shares are calculated from 2 base
-# salary_share_value = (6.55 / 100) * ceiling_salary
-# salary_share_total += float(salary_share_value)
-# ps_description = "= 6.55% * " + str(ceiling_salary) + " (=salaire plafonné)"
-# employer_share_value = gross_salary * (1.60 / 100) + ceiling_salary * (8.20 / 100)
-# pp_description = "= 1.60% * " + str(gross_salary) + " + 8.20% * " + str(ceiling_salary) + " = 1.60% * salaire brut + 8.20% * salaire plafonné"
-# createPaySheetLine( new_title = 'Assurance vieillesse',
-#                     share     = 'cs',
-#                     src_deb   = float(employer_share_value) + float(salary_share_value),
-#                     dest_sec  = org_urssaf,
-#                     new_desc  = ps_description)
-# createPaySheetLine( new_title = 'Assurance vieillesse',
-#                     share     = 'pp',
-#                     src_deb   = employer_share_value,
-#                     dest_sec  = org_urssaf,
-#                     new_desc  = pp_description)
-oldage_insurance1 = { 'salary_share_rate'   : None
-                    , 'employer_share_rate' : 1.60
-                    , 'base_value'          : gross_salary
-                    , 'base_description'    : "salaire brut"
-                    }
-addPaySheetItem(title    = 'Assurance vieillesse 1',
-                values   = oldage_insurance1,
-                dest_org = org_urssaf)
-oldage_insurance2 = { 'salary_share_rate'   : 6.55
-                    , 'employer_share_rate' : 8.20
-                    , 'base_value'          : ceiling_salary
-                    , 'base_description'    : "salaire plafonné"
-                    }
-addPaySheetItem(title    = 'Assurance vieillesse 2',
-                values   = oldage_insurance2,
-                dest_org = org_urssaf)
-# widowhood insurance
-widowhood_insurance =   { 'salary_share_rate'   : 0.10
-                        , 'employer_share_rate' : None
-                        , 'base_value'          : gross_salary
-                        , 'base_description'    : "salaire brut"
-                        }
-addPaySheetItem(title    = 'Assurance veuvage',
-                values   = widowhood_insurance,
-                dest_org = org_urssaf)
-# family benefits
-family_benefits =   { 'salary_share_rate'   : None
-                    , 'employer_share_rate' : 5.40
-                    , 'base_value'          : gross_salary
-                    , 'base_description'    : "salaire brut"
-                    }
-addPaySheetItem(title       = 'Allocations familiales',
-                values      = family_benefits,
-                dest_org    = org_urssaf)
-# industrial accident
-industrial_accident =   { 'salary_share_rate'   : None
-                        , 'employer_share_rate' : 1.10  # rate depending of company size, department & trade; 1.0 as standard rate, 1.1 for IT
-                        , 'base_value'          : gross_salary
-                        , 'base_description'    : "salaire brut"
-                        }
-addPaySheetItem(title    = 'Accidents du travail',
-                values   = industrial_accident,
-                dest_org = org_urssaf)
-# lodging helps
-lodging_helps = { 'salary_share_rate'   : None
-                , 'employer_share_rate' : None
-                , 'base_value'          : None
-                , 'base_description'    : None
-                }
-if company_size > 9:
-    lodging_helps['employer_share_rate'] = 0.40
-    lodging_helps['base_description'] = "salaire brut"
-    lodging_helps['base_value'] = gross_salary
-else:
-    lodging_helps['employer_share_rate'] = 0.10
-    lodging_helps['base_description'] = "salaire plafonné"
-    lodging_helps['base_value'] = ceiling_salary
-addPaySheetItem(title    = 'Aide au logement',
-                values   = lodging_helps,
-                dest_org = org_urssaf)
-# transport payment
-if company_size > 9:
-    transport_payment = { 'salary_share_rate'   : None
-                        , 'employer_share_rate' : 1.80     # rate depending of the town
-                        , 'base_value'          : gross_salary
-                        , 'base_description'    : "salaire brut"
-                        }
-    addPaySheetItem(title       = 'Versement au transport',
-                    values      = transport_payment,
-                    dest_org    = org_urssaf)
-
-
-
-### CSG = Contribution Sociale Generalisee (deductible / non deductible)
-CSGd =  { 'salary_share_rate'   : 2.4
-        , 'employer_share_rate' : None
-        , 'base_value'          : 0.95 * gross_salary
-        , 'base_description'    : "95% du salaire brut"
-        }
-addPaySheetItem(title    = 'CSG deductible',
-                values   = CSGd,
-                dest_org = org_urssaf)
-CSGnd = { 'salary_share_rate'   : 5.1
-        , 'employer_share_rate' : None
-        , 'base_value'          : 0.95 * gross_salary
-        , 'base_description'    : "95% du salaire brut"
-        }
-addPaySheetItem(title    = 'CSG non deductible',
-                values   = CSGnd,
-                dest_org = org_urssaf)
-
-
-
-### CRDS = Contribution pour le Remboursement de la Dette Sociale
-CRDS =  { 'salary_share_rate'   : 0.5
-        , 'employer_share_rate' : None
-        , 'base_value'          : 0.95 * gross_salary
-        , 'base_description'    : "95% du salaire brut"
-        }
-addPaySheetItem(title    = 'CRDS',
-                values   = CRDS,
-                dest_org = org_urssaf)
-
-
-
-### Unemployment Insurance
-if char_slice == 'A' or char_slice == 'B':
-    unemployment_insurance =    { 'salary_share_rate'   : 2.4
-                                , 'employer_share_rate' : 4.0
-                                , 'base_value'          : gross_salary
-                                , 'base_description'    : "salaire brut"
-                                }
-    addPaySheetItem(title    = 'Assurance chomage',
-                    values   = unemployment_insurance,
-                    dest_org = org_assedic)
-
-
-
-### AGS (FNGS)
-if char_slice == 'A' or char_slice == 'B':
-    AGS =   { 'salary_share_rate'   : None
-            , 'employer_share_rate' : 0.35
-            , 'base_value'          : gross_salary
-            , 'base_description'    : "salaire brut"
-            }
-    addPaySheetItem(title    = 'AGS',
-                    values   = AGS,
-                    dest_org = org_assedic)
-
-
-
-### supplementary pension
-# ARRCO
-ARRCO = { 'salary_share_rate'   : None
-        , 'employer_share_rate' : None
-        , 'base_value'          : gross_salary
-        , 'base_description'    : "salaire brut"
-        }
-if executive == False:
-    if num_slice == 1:
-        ARRCO['salary_share_rate']   = 3.0
-        ARRCO['employer_share_rate'] = 4.5
-    elif num_slice == 2:
-        if comp_type == 'old':
-            ARRCO['salary_share_rate']   = 6.0
-            ARRCO['employer_share_rate'] = 9.0
-        else:
-            ARRCO['salary_share_rate']   = 8.0
-            ARRCO['employer_share_rate'] = 12.0
-elif char_slice == 'A':
-    ARRCO['salary_share_rate']   = 3.0
-    ARRCO['employer_share_rate'] = 4.5
-addPaySheetItem(title    = 'ARRCO',
-                values   = ARRCO,
-                dest_org = org_arrco)
-# AGFF
-AGFF =  { 'salary_share_rate'   : None
-        , 'employer_share_rate' : None
-        , 'base_value'          : gross_salary
-        , 'base_description'    : "salaire brut"
-        }
-if ((executive == False and num_slice == 1) or
-    (executive == True and char_slice == 'A')):
-    AGFF['salary_share_rate']   = 0.80
-    AGFF['employer_share_rate'] = 1.20
-elif ((executive == False and num_slice == 2) or
-      (executive == True and char_slice == 'B')):
-    AGFF['salary_share_rate']   = 0.90
-    AGFF['employer_share_rate'] = 1.30
-addPaySheetItem(title    = 'AGFF',
-                values   = AGFF,
-                dest_org = org_agff)
-# AGIRC
-if executive == True:
-    AGIRC = { 'salary_share_rate'   : None
-            , 'employer_share_rate' : None
-            , 'base_value'          : gross_salary
-            , 'base_description'    : "salaire brut"
-            }
-    if char_slice == 'B':
-        AGIRC['salary_share_rate']   = 7.50
-        AGIRC['employer_share_rate'] = 12.50
-    elif char_slice == 'C':
-        # free repartition (20% to share between employee & employer)
-        AGIRC['salary_share_rate']   = 10.0
-        AGIRC['employer_share_rate'] = 10.0
-    addPaySheetItem(title    = 'AGIRC',
-                    values   = AGIRC,
-                    dest_org = org_agirc)
-# CET
-if executive == True and (char_slice == 'A' or char_slice == 'B' or char_slice == 'C'):
-    CET =   { 'salary_share_rate'   : 0.13
-            , 'employer_share_rate' : 0.22
-            , 'base_value'          : gross_salary
-            , 'base_description'    : "salaire brut"
-            }
-    addPaySheetItem(title    = 'CET',
-                    values   = CET,
-                    dest_org = org_agirc)
-
-
-
-### life insurance
-if executive == True and char_slice == 'A':
-    life_insurance =    { 'salary_share_rate'   : None
-                        , 'employer_share_rate' : 1.5
-                        , 'base_value'          : gross_salary
-                        , 'base_description'    : "salaire brut"
-                        }
-    addPaySheetItem(title    = 'Assurance deces',
-                    values   = life_insurance,
-                    dest_org = org_urssaf)
-
-
-
-### APEC
-if char_slice == 'B':
-    APEC =  { 'salary_share_rate'   : 0.024
-            , 'employer_share_rate' : 0.036
-            , 'base_value'          : gross_salary
-            , 'base_description'    : "salaire brut"
-            }
-    #!!! verifier l'application de cette histoire de forfait...
-    #if executive == True and DateTime.Date.Today().month == 3:
-    #  apec['s'] = apec['s'] + 7.0
-    #  apec['e'] = apec['e'] + 10.51
-    addPaySheetItem(title    = 'APEC',
-                    values   = APEC,
-                    dest_org = org_apec)
-
-
-
-### Taxes
-# construction tax
-if company_size > 9:
-    construction_tax =  { 'salary_share_rate'   : None
-                        , 'employer_share_rate' : 0.45
-                        , 'base_value'          : gross_salary
-                        , 'base_description'    : "salaire brut"
-                        }
-    addPaySheetItem(title    = 'Construction',
-                    values   = construction_tax,
-                    dest_org = org_etat)
-# training tax
-training_tax =  { 'salary_share_rate'   : None
-                , 'employer_share_rate' : 0.50
-                , 'base_value'          : gross_salary
-                , 'base_description'    : "salaire brut"
-                }
-addPaySheetItem(title    = 'Apprentissage',
-                values   = training_tax,
-                dest_org = org_etat)
-# courses tax
-courses_tax =   { 'salary_share_rate'   : None
-                , 'employer_share_rate' : None
-                , 'base_value'          : gross_salary
-                , 'base_description'    : "salaire brut"
-                }
-if company_size < 10:
-    courses_tax['employer_share_rate'] = 0.15
-else:
-    courses_tax['employer_share_rate'] = 1.5
-addPaySheetItem(title    = 'Formation professionnelle',
-                values   = courses_tax,
-                dest_org = org_etat)
-
-
-
-### Take Home salary
-final_salary = gross_salary - salary_share_total
-createPaySheetLine(new_id    = 'final_salary',
-                   new_title = 'Salaire Net',
-                   src_sec   = employer,
-                   src       = dette_salarie,
-                   src_deb   = final_salary,
-                   dest_sec  = employee,
-                   dest      = creance_salarie)
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_checkParameters.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_checkParameters.py
deleted file mode 100755
index 8e22d3c6d2b72e0ba0577648678e6cc6ebf1caf1..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_checkParameters.py
+++ /dev/null
@@ -1,38 +0,0 @@
-## Script (Python) "PaySheetTransaction_checkParameters"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-paysheet      = context.getObject()
-paysheet_type = paysheet.getPortalType()
-
-employee      = paysheet.getDestinationSection()
-employer      = paysheet.getSourceSection()
-
-if paysheet.getGrossSalary() == None:
-  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '?portal_status_message=Gross+salary+is+required')
-
-if employee in ('', None):
-  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '?portal_status_message=The+employee+is+required')
-
-if employer in ('', None):
-  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '?portal_status_message=The+employer+is+required')
-
-employee_obj  = paysheet.getDestinationSectionValue()
-employer_obj  = paysheet.getSourceSectionValue()
-
-if employee_obj.getCareerGrade() in ('', None):
-  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '?portal_status_message=The+employee+must+have+a+career+grade')
-
-if employer_obj.getCreationDate() in ('', None):
-  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '?portal_status_message=The+employer+must+have+an+organisation+creation+date')
-
-if employer_obj.getDefaultAddress().getZipCode() in ('', None):
-  return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '?portal_status_message=The+employer+must+have+a+zip+code')
-
-# parameters are OK, go to the pre-calculation form
-return context.REQUEST.RESPONSE.redirect(context.absolute_url() + "/PaySheetTransaction_viewPreview?selection_name=default&amp;dialog_category=object_action&amp;form_id=PaySheetTransaction_view")
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_generatePaySheetTransactionLineList.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_generatePaySheetTransactionLineList.py
deleted file mode 100755
index efa00abe5f07bb5facf1e510d4adac8e8d7b6944..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_generatePaySheetTransactionLineList.py
+++ /dev/null
@@ -1,175 +0,0 @@
-## Script (Python) "PaySheetTransaction_generatePaySheetTransactionLineList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-paysheet                        = context.getObject()
-paysheet_type                   = paysheet.getPortalType()
-paysheet_line_type              = 'Pay Sheet Line'
-paysheet_transactionline_type   = 'Pay Sheet Transaction Line'
-paysheet_cell_type              = 'Pay Sheet Cell'
-
-employee            = paysheet.getDestinationSection()
-employer            = paysheet.getSourceSection()
-employer_object     = paysheet.getSourceSectionValue()
-
-
-# gross salary source and destination
-charge_salariale = 'account/charges_salariales'
-produit_salarial = 'account/produits_salariaux'
-
-# final salary source and destination
-dette_salarie   = 'account/dettes_salaries'
-creance_salarie = 'account/creances_salaries'
-
-# employer share source and destination
-charge_sociale = 'account/charges_sociales'
-produit_social = 'account/produits_sociaux'
-
-# employer + employee share source and destination
-dette_sociale   = 'account/dettes_sociales'
-creance_sociale = 'account/creances_sociales'
-
-# the currency related to this french rules set is euros
-paysheet_resource = 'currency/EUR'
-
-
-
-# Create a new pay sheet line
-def createPaySheetTransactionLine(new_title='', share='',
-                                  src_sec='', src='', src_deb=None,
-                                  dest_sec='', dest='', new_desc=''):
-    suffix =    { 'social'  : ' (cotisations sociales)'
-                , 'employer': ' (part patronale)'
-                }
-    if share == 'social' or share == 'employer':
-        new_title += suffix[share]
-        if share == 'social':
-            src_sec  = employer
-            src      = dette_sociale
-            dest     = creance_sociale
-        elif share == 'employer':
-            src_sec  = employer
-            src      = charge_sociale
-            dest     = produit_social
-    new_id = str(paysheet.generateNewId())
-    context.portal_types.constructContent   ( type_name = paysheet_transactionline_type
-                                            , container = paysheet
-                                            , id        = new_id
-                                            )
-    # alternate method but doesn't work
-    #new_line = paysheet.getObject(new_id)
-    paysheet[new_id].setTitle(new_title)
-    paysheet[new_id].setResource(paysheet_resource)
-    paysheet[new_id].setSourceSection(src_sec)
-    paysheet[new_id].setSource(src)
-    paysheet[new_id].setDestinationSection(dest_sec)
-    paysheet[new_id].setDestination(dest)
-    paysheet[new_id].setSourceDebit(src_deb)
-    paysheet[new_id].setDescription(new_desc)
-
-
-
-def addAccountingItem(title='', mplyee_share=None, mplyer_share=None, dest_org=''):
-    if mplyer_share == 0 and mplyee_share == 0:
-        return
-    if mplyer_share == 0:
-        createPaySheetTransactionLine   ( new_title = title
-                                        , share     = 'social'
-                                        , src_deb   = mplyee_share
-                                        , dest_sec  = dest_org
-                                        )
-        return
-    if mplyee_share == 0:
-        createPaySheetTransactionLine   ( new_title = title
-                                        , share     = 'social'
-                                        , src_deb   = mplyer_share
-                                        , dest_sec  = dest_org
-                                        )
-        createPaySheetTransactionLine   ( new_title = title
-                                        , share     = 'employer'
-                                        , src_deb   = mplyer_share
-                                        , dest_sec  = dest_org
-                                        )
-        return
-    createPaySheetTransactionLine   ( new_title = title
-                                    , share     = 'social'
-                                    , src_deb   = float(mplyer_share) + float(mplyee_share)
-                                    , dest_sec  = dest_org
-                                    )
-    createPaySheetTransactionLine   ( new_title = title
-                                    , share     = 'employer'
-                                    , src_deb   = mplyer_share
-                                    , dest_sec  = dest_org
-                                    )
-
-
-
-# Only keep the PaySheetLine in the paysheet, delete all other objects
-id_list = []
-for paysheet_item in paysheet.objectValues():
-    if paysheet_item.getPortalType() != paysheet_line_type:
-        id_list.append(paysheet_item.getId())
-paysheet.manage_delObjects(id_list)
-
-# Get all amount
-paysheet_details = paysheet.PaySheetTransaction_getDetails()
-paysheet_categories = paysheet_details['paysheet_categories']
-
-paysheet_formated_lines = []
-for category in paysheet_categories:
-  for line in paysheet_categories[category]['lines']:
-    paysheet_formated_lines.append(line)
-
-# Analyze every PaySheet Line
-paysheet_lines = paysheet.objectValues()
-for paysheet_item in paysheet_lines:
-    if paysheet_item.getPortalType() == paysheet_line_type:
-
-        # Find the dictionnary that contain the pre-calculated employer and employee share
-        employer_share = 0.0
-        employee_share = 0.0
-        for line in paysheet_formated_lines:
-            if line['id'] == paysheet_item.getId():
-                er = line['employer_share']
-                ee = line['employee_share']
-                if er not in (None, ''):
-                    employer_share += abs(float(er))
-                if ee not in (None, ''):
-                    employee_share += abs(float(ee))
-
-        # Get the destination organisation
-        paysheet_line_service = paysheet_item.getResourceValue()
-        organisation = paysheet_line_service.getSource()
-
-        # Add accounting item corresponding to the PaySheet Line
-        addAccountingItem   ( title     = paysheet_item.getTitle()
-                            , mplyer_share = employer_share
-                            , mplyee_share = employee_share
-                            , dest_org  = organisation
-                            )
-
-# Add the gross salary
-createPaySheetTransactionLine   ( new_title = 'Salaire brut'
-                                , src_sec   = employer
-                                , src       = charge_salariale
-                                , src_deb   = abs(float(paysheet_details['gross_salary']))
-                                , dest_sec  = employee
-                                , dest      = produit_salarial
-                                )
-
-# Add the final salary
-createPaySheetTransactionLine   ( new_title = 'Salaire net'
-                                , src_sec   = employer
-                                , src       = dette_salarie
-                                , src_deb   = abs(float(paysheet_details['net_salary']))
-                                , dest_sec  = employee
-                                , dest      = creance_salarie
-                                )
-
-# 'refresh' screen
-return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '?portal_status_message=Pay+Sheet+Transaction+Lines+created.')
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getDetails.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getDetails.py
deleted file mode 100755
index 4ba813d07cda89ab70030ec31a9cd8d6c63afe70..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getDetails.py
+++ /dev/null
@@ -1,139 +0,0 @@
-## Script (Python) "PaySheetTransaction_getDetails"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# this dict contain all paysheet details
-paysheet_details = {}
-
-# initialize the employee and employer share total
-total_employee_share          = 0.0
-total_employer_share          = 0.0
-total_taxable_employee_share  = 0.0
-
-# get the gross salary
-gross_salary = context.getGrossSalary()
-if gross_salary == None:
-  gross_salary = 0.0
-
-paysheet_cat = {}
-object_list = []
-for object in context.objectValues():
-  object_list += [object]
-# Sort the list by id since lines are already ordered by id.
-object_list.sort(lambda x, y: cmp(int(x.getId()), int(y.getId())))
-for pay_sheet_line in object_list:
-  variation_list =  pay_sheet_line.getVariationCategoryList()
-  range_variation = []
-  for variation in variation_list:
-    if variation.find('salary_range')==0:
-      if not variation in range_variation: # Extra checking because
-                                           # get VariationCategoryList returns
-                                           # the same 1 items 2 times
-        range_variation += [variation]
-  for range in range_variation:
-    pay_sheet_dict = {}
-    #pay_sheet_dict['range']=range[range.rfind('/')+1:]
-    pay_sheet_dict['id'] = pay_sheet_line.getId()
-    pay_sheet_dict['title'] = pay_sheet_line.getResourceTitle()
-    for cell in pay_sheet_line.objectValues():
-      predicate_list = cell.getPredicateValueList()
-      if range in predicate_list:
-        pay_sheet_dict['base_name'] = context.portal_categories.resolveCategory(range).getTitleOrId()
-        for predicate in predicate_list:
-          if cell.getTotalPrice() != 0:
-            if predicate.find('employee_share')>=0:
-              pay_sheet_dict['base']= - cell.getQuantity()
-              pay_sheet_dict['employee_share'] = cell.getTotalPrice()
-              pay_sheet_dict['employee_share_rate'] = cell.getPrice() * 100
-              total_employee_share += float(-pay_sheet_dict['employee_share'])
-              # here we decide if a resource is taxable or not
-              if str(pay_sheet_line.getResource())[-14:] == 'non_deductible' or str(pay_sheet_line.getResource())[-4:] == 'crds' or str(pay_sheet_line.getResource())[-7:] == 'taxable':
-                pay_sheet_dict['taxable']='yes'
-              elif str(pay_sheet_line.getResource())[-10:] == 'deductible':
-                pay_sheet_dict['taxable']='no'
-              else:
-                pay_sheet_dict['taxable']='no'
-              if pay_sheet_dict['taxable'] == 'yes':
-                total_taxable_employee_share += float(-pay_sheet_dict['employee_share'])
-            elif predicate.find('employer_share')>=0:
-              pay_sheet_dict['base'] = - cell.getQuantity()
-              pay_sheet_dict['employer_share'] = cell.getTotalPrice()
-              pay_sheet_dict['employer_share_rate'] = cell.getPrice() * 100
-              total_employer_share += float(-pay_sheet_dict['employer_share'])
-    for key in ('employee_share','employee_share_rate','employer_share','employer_share_rate'):
-      if not (pay_sheet_dict.has_key(key)):
-        pay_sheet_dict[key]='' # so that we can display nothing
-
-    # find the category of the current pay sheet line
-    cat_id = None
-    cat_path = None
-    for var in variation_list:
-      sub_cat = var.split('/')
-      if sub_cat[0] == 'tax_category':
-        cat_id = sub_cat[1]
-        cat_path = sub_cat[0] + '/' + sub_cat[1]
-        break
-    if cat_id == None:
-      cat_id = 'no_cat'
-    # add the current pay sheet line to its category
-    if not paysheet_cat.has_key(cat_id):
-      paysheet_cat[cat_id] = {}
-      paysheet_cat[cat_id]['lines'] = []
-    if cat_path != None:
-      paysheet_cat[cat_id]['title'] = context.portal_categories.resolveCategory(cat_path).getTitleOrId()
-    paysheet_cat[cat_id]['lines'].append(pay_sheet_dict)
-
-# get all paysheet transaction to calculate the sum of different value in a year
-accounting_folder = context.aq_parent
-paysheet_transactions = accounting_folder.contentValues(filter={'portal_type':'Pay Sheet Transaction'})
-
-# initialize every yearly variable
-yearly_net_salary           = 0.0
-yearly_gross_salary         = 0.0
-yearly_employee_share       = 0.0
-yearly_employer_share       = 0.0
-yearly_taxable_net_salary   = 0.0
-
-# get the current paysheet start date and employee
-start_date  = context.getStartDate()
-employee    = context.restrictedTraverse(context.getDestinationSectionRelativeUrl())
-
-# browse through paysheet transaction
-for paysheet_obj in paysheet_transactions:
-  # ignore the current paysheet to avoid infinite loop
-  if paysheet_obj.getId() != context.getId():
-    # the paysheet must have the same employee
-    if (employee==None) or (employee!=None and context.restrictedTraverse(paysheet_obj.getDestinationSectionRelativeUrl())==employee):
-      # check the date
-      if (start_date==None) or (start_date!=None and paysheet_obj.getStartDate()!=None and start_date.year()==paysheet_obj.getStartDate().year() and paysheet_obj.getStartDate()<= start_date):
-        # get all detailed values of the paysheet
-        ps_details = paysheet_obj.PaySheetTransaction_getDetails()
-        # sum of yearly values
-        yearly_net_salary           += float(ps_details['net_salary'])
-        yearly_gross_salary         += float(ps_details['gross_salary'])
-        yearly_employee_share       += float(ps_details['total_employee_share'])
-        yearly_employer_share       += float(ps_details['total_employer_share'])
-        yearly_taxable_net_salary   += float(ps_details['taxable_net_salary'])
-
-# save the total share values in the exported dict
-paysheet_details['net_salary']                    = gross_salary - total_employee_share
-paysheet_details['gross_salary']                  = gross_salary
-paysheet_details['paysheet_categories']           = paysheet_cat
-paysheet_details['total_employee_share']          = total_employee_share
-paysheet_details['taxable_net_salary']            = paysheet_details['net_salary'] + total_taxable_employee_share
-paysheet_details['total_employer_share']          = total_employer_share
-paysheet_details['total_taxable_employee_share']  = total_taxable_employee_share
-
-# don't forget to add the current values to the yearly sum
-paysheet_details['yearly_net_salary']         = yearly_net_salary + paysheet_details['net_salary']
-paysheet_details['yearly_gross_salary']       = yearly_gross_salary + paysheet_details['gross_salary']
-paysheet_details['yearly_employee_share']     = yearly_employee_share + paysheet_details['total_employee_share']
-paysheet_details['yearly_employer_share']     = yearly_employer_share + paysheet_details['total_employer_share']
-paysheet_details['yearly_taxable_net_salary'] = yearly_taxable_net_salary + paysheet_details['taxable_net_salary']
-
-return paysheet_details
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getDetails_BACKUP.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getDetails_BACKUP.py
deleted file mode 100755
index 19678da97e1418aeab96f49ce3eccaaea5676bcb..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getDetails_BACKUP.py
+++ /dev/null
@@ -1,118 +0,0 @@
-## Script (Python) "PaySheetTransaction_getDetails_BACKUP"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# this dict contain all paysheet details
-paysheet_details = {}
-
-# initialize the salary and employer share total
-total_salary_share          = 0.0
-total_employer_share        = 0.0
-total_taxable_salary_share  = 0.0
-
-# get the gross salary
-gross_salary = context.getGrossSalary()
-
-pay_sheet_lines=tuple()
-object_list = []
-for object in context.objectValues():
-  object_list += [object]
-# Sort the list by id since lines are already ordered by id.
-object_list.sort(lambda x, y: cmp(int(x.getId()), int(y.getId())))
-for pay_sheet_line in object_list:
-  variation_list =  pay_sheet_line.getVariationCategoryList()
-  range_variation = []
-  for variation in variation_list:
-    if variation.find('salary_range')==0:
-      if not variation in range_variation: # Extra checking because
-                                           # get VariationCategoryList returns
-                                           # the same 1 items 2 times
-        range_variation += [variation]
-  for range in range_variation:
-    pay_sheet_dict = {}
-    #pay_sheet_dict['range']=range[range.rfind('/')+1:]
-    pay_sheet_dict['id'] = pay_sheet_line.getId()
-    pay_sheet_dict['title'] = pay_sheet_line.getResourceTitle()
-    for cell in pay_sheet_line.objectValues():
-      predicate_list = cell.getPredicateValueList()
-      if range in predicate_list:
-        for predicate in predicate_list:
-          if cell.getTotalPrice() != 0:
-            if predicate.find('salary_share')>=0:
-              pay_sheet_dict['base']= - cell.getQuantity()
-              pay_sheet_dict['salary_share'] = cell.getTotalPrice()
-              pay_sheet_dict['salary_share_rate'] = cell.getPrice() * 100
-              total_salary_share += float(-pay_sheet_dict['salary_share'])
-              # here we decide if a resource is taxable or not
-              if str(pay_sheet_line.getResource())[-14:] == 'non_deductible' or str(pay_sheet_line.getResource())[-4:] == 'crds' or str(pay_sheet_line.getResource())[-7:] == 'taxable':
-                pay_sheet_dict['taxable']='yes'
-              elif str(pay_sheet_line.getResource())[-10:] == 'deductible':
-                pay_sheet_dict['taxable']='no'
-              else:
-                pay_sheet_dict['taxable']='no'
-              if pay_sheet_dict['taxable'] == 'yes':
-                total_taxable_salary_share += float(-pay_sheet_dict['salary_share'])
-            elif predicate.find('employer_share')>=0:
-              pay_sheet_dict['base'] = - cell.getQuantity()
-              pay_sheet_dict['employer_share'] = cell.getTotalPrice()
-              pay_sheet_dict['employer_share_rate'] = cell.getPrice() * 100
-              total_employer_share += float(-pay_sheet_dict['employer_share'])
-    for key in ('salary_share','salary_share_rate','employer_share','employer_share_rate'):
-      if not (pay_sheet_dict.has_key(key)):
-        pay_sheet_dict[key]='' # so that we can display nothing
-    pay_sheet_lines += (pay_sheet_dict,)
-
-# get all paysheet transaction to calculate the sum of different value in a year
-accounting_folder = context.aq_parent
-paysheet_transactions = accounting_folder.contentValues(filter={'portal_type':'Pay Sheet Transaction'})
-
-# initialize every yearly variable
-yearly_net_salary           = 0.0
-yearly_gross_salary         = 0.0
-yearly_salary_share         = 0.0
-yearly_employer_share       = 0.0
-yearly_taxable_net_salary   = 0.0
-
-# get the current paysheet start date and employee
-start_date  = context.getStartDate()
-employee    = context.restrictedTraverse(context.getDestinationSectionRelativeUrl())
-
-# browse through paysheet transaction
-for paysheet_obj in paysheet_transactions:
-  # ignore the current paysheet
-  if paysheet_obj.getId() != context.getId():
-    # the paysheet must have the same employee
-    if (employee==None) or (employee!=None and context.restrictedTraverse(paysheet_obj.getDestinationSectionRelativeUrl())==employee):
-      # check the date
-      if (start_date==None) or (start_date!=None and paysheet_obj.getStartDate()!=None and start_date.year()==paysheet_obj.getStartDate().year() and paysheet_obj.getStartDate()<= start_date):
-        # get all detailed values of the paysheet
-        ps_details = paysheet_obj.PaySheetTransaction_getDetails()
-        # sum of yearly values
-        yearly_net_salary           += float(ps_details['net_salary'])
-        yearly_gross_salary         += float(ps_details['gross_salary'])
-        yearly_salary_share         += float(ps_details['total_salary_share'])
-        yearly_employer_share       += float(ps_details['total_employer_share'])
-        yearly_taxable_net_salary   += float(ps_details['taxable_net_salary'])
-
-# save the total share values in the exported dict
-paysheet_details['net_salary']                  = gross_salary - total_salary_share
-paysheet_details['gross_salary']                = gross_salary
-paysheet_details['paysheet_lines']              = pay_sheet_lines
-paysheet_details['total_salary_share']          = total_salary_share
-paysheet_details['taxable_net_salary']          = paysheet_details['net_salary'] + total_taxable_salary_share
-paysheet_details['total_employer_share']        = total_employer_share
-paysheet_details['total_taxable_salary_share']  = total_taxable_salary_share
-
-# don't forget to add the current values to the yearly sum
-paysheet_details['yearly_net_salary']           = yearly_net_salary + paysheet_details['net_salary']
-paysheet_details['yearly_gross_salary']         = yearly_gross_salary + paysheet_details['gross_salary']
-paysheet_details['yearly_salary_share']         = yearly_salary_share + paysheet_details['total_salary_share']
-paysheet_details['yearly_employer_share']       = yearly_employer_share + paysheet_details['total_employer_share']
-paysheet_details['yearly_taxable_net_salary']   = yearly_taxable_net_salary + paysheet_details['taxable_net_salary']
-
-return paysheet_details
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getFormattedLines_OLD.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getFormattedLines_OLD.py
deleted file mode 100755
index e8683d8bdfcf8df49482e1879e6bcc4bc40cf728..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getFormattedLines_OLD.py
+++ /dev/null
@@ -1,57 +0,0 @@
-## Script (Python) "PaySheetTransaction_getFormattedLines_OLD"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# Example code:
-
-pay_sheet_lines=tuple()
-object_list = []
-for object in context.objectValues():
-  object_list += [object]
-# Sort the list by id since lines are already ordered by id.
-object_list.sort(lambda x, y: cmp(int(x.getId()), int(y.getId())))
-for pay_sheet_line in object_list:
-  variation_list =  pay_sheet_line.getVariationCategoryList()
-  range_variation = []
-  for variation in variation_list:
-    if variation.find('salary_range')==0:
-      if not variation in range_variation: # Extra checking because
-                                           # get VariationCategoryList returns
-                                           # the same 1 items 2 times
-        range_variation += [variation]
-  for range in range_variation:
-    pay_sheet_dict = {}
-    #pay_sheet_dict['range']=range[range.rfind('/')+1:]
-    pay_sheet_dict['id'] = pay_sheet_line.getId()
-    pay_sheet_dict['title'] = pay_sheet_line.getResourceTitle()
-    for cell in pay_sheet_line.objectValues():
-      predicate_list = cell.getPredicateValueList()
-      if range in predicate_list:
-        for predicate in predicate_list:
-          if cell.getTotalPrice() != 0:
-            if predicate.find('salary_share')>=0:
-              pay_sheet_dict['range']= - cell.getQuantity()
-              pay_sheet_dict['salary_share']='%.2f' % cell.getTotalPrice()
-              pay_sheet_dict['salary_share_rate']='%.3f %%' % (cell.getPrice()*100)
-              if str(pay_sheet_line.getResource())[-14:] == 'non_deductible' or str(pay_sheet_line.getResource())[-4:] == 'crds' or str(pay_sheet_line.getResource())[-7:] == 'taxable':
-                pay_sheet_dict['taxable']='yes'
-              elif str(pay_sheet_line.getResource())[-10:] == 'deductible':
-                pay_sheet_dict['taxable']='no'
-              else:
-                pay_sheet_dict['taxable']='no'
-            elif predicate.find('employer_share')>=0:
-              pay_sheet_dict['range']= - cell.getQuantity()
-              pay_sheet_dict['employer_share']='%.2f' % cell.getTotalPrice()
-              pay_sheet_dict['employer_share_rate']='%.3f %%' % (cell.getPrice()*100)
-    for key in ('salary_share','salary_share_rate','employer_share','employer_share_rate'):
-      if not (pay_sheet_dict.has_key(key)):
-        pay_sheet_dict[key]='' # so that we can display nothing
-    pay_sheet_lines += (pay_sheet_dict,)
-
-
-return pay_sheet_lines
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getLineListPrintFormat.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getLineListPrintFormat.py
deleted file mode 100755
index 3a66660cf71a6b0a94328801ae0317f8394a890b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getLineListPrintFormat.py
+++ /dev/null
@@ -1,61 +0,0 @@
-## Script (Python) "PaySheetTransaction_getLineListPrintFormat"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-True  = 1
-False = 0
-
-pay_sheet = context.getObject()
-all = pay_sheet.objectValues()
-
-# this dictionnary contain all pay sheet details extracted from Pay Sheet Lines.
-# these details are sorted and tidy for a clean print of the Pay Sheet
-formated_lines = []             # id, title, pp, cs, ps
-# todo: add: description assiette, montant assiette, pourcentage de la part salariale et patronale
-
-# get all PaySheetLines
-for pay_sheet_line in all:
-    ID = pay_sheet_line.getId()
-    if ID[-3:] == '_pp' or ID[-3:] == '_cs':
-        # Base_viewSearchResultList an existing id without the suffix in the final table
-        i = 0
-        id_exist = False
-        for line in formated_lines:
-            if line['id'] == ID[:-3]:
-                id_exist = True
-                break
-            i += 1
-        # add a new line of contribution in pay sheet details
-        if id_exist == False:
-            new_formated_line = {   'id'        : ID[:-3],
-                                    'title'     : None,
-                                    'pp'        : None,
-                                    'cs'        : None,
-                                    'ps'        : None,
-                                    'ps_desc'   : None,
-                                    'pp_desc'   : None}
-            formated_lines.append(new_formated_line)
-        # get the employer share ('pp' is the french acronym of 'part patronale')
-        if ID[-3:] == '_pp':
-            formated_lines[i]['pp'] = pay_sheet_line.getDestinationCredit()
-            formated_lines[i]['pp_desc'] = pay_sheet_line.getDescription()
-        # get the social contribution (= employer + salary share) ('cs' is a french acronym of 'cotisation sociale')
-        elif ID[-3:] == '_cs':
-            formated_lines[i]['cs'] = pay_sheet_line.getDestinationCredit()
-            formated_lines[i]['title'] = pay_sheet_line.getTitle()
-            formated_lines[i]['ps_desc'] = pay_sheet_line.getDescription()
-
-# calculation of the salary share ('ps' is a french acronym of 'part salariale')
-for line in formated_lines:
-    if line['cs']!=None and line['pp']!=None and line['cs']!=line['pp']:
-        line['ps'] = float(line['cs']) - float(line['pp'])
-    if line['cs']!=None and line['pp']==None:
-        line['ps'] = float(line['cs'])
-
-
-return formated_lines
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getPreavis.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getPreavis.py
deleted file mode 100755
index eba869c4dbfe501be21874f8a88db697597defb7..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getPreavis.py
+++ /dev/null
@@ -1,48 +0,0 @@
-## Script (Python) "PaySheetTransaction_getPreavis"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# Définition des préavis selon le temps dans l'entreprise (en jours)
-seuils = [ { 'limite':30 , 'preavis':'1 jour' },    # 1er mois d'essai
-           { 'limite':60 , 'preavis':'1 semaine' }, # 2e mois d'essai
-           { 'limite':730, 'preavis':'1 mois' },    # 2 premières années
-           { 'limite':0,   'preavis':'2 mois' } ]   # Après les 2 premières années
-
-
-paysheet        = context.getObject()
-employee_object = paysheet.getDestinationSectionValue()
-
-
-# Récupération de l'entreprise actuelle
-currentOrg = None
-if hasattr(employee_object,"default_career"):
-  currentOrg = employee_object["default_career"].getSubordinationValue()
-
-if currentOrg == None:
-  return '???'
-  
-# Calcul du temps total dans cette entreprise
-totalTime = 0
-steps = employee_object.contentValues()
-for step in steps:
-  if step.getPortalType() == "Career" and step.getId() != "default_career":
-    if step.getSubordinationValue() == currentOrg:
-      difference = step.getStopDate() - step.getStartDate()
-      if difference > 0:
-        totalTime = totalTime + difference
-
-totalTime = int( totalTime + (DateTime() - employee_object["default_career"].getStartDate()) )
-
-
-# Détermination du préavis
-for i in range(len(seuils)):
-  if i < len(seuils)-1:
-    if seuils[i]['limite'] >= totalTime:
-      return seuils[i]['preavis']
-  else:
-    return seuils[i]['preavis']
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getReportLineList.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getReportLineList.py
deleted file mode 100755
index 12f326537962cab2500aaa50894e59dfd745f14d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_getReportLineList.py
+++ /dev/null
@@ -1,45 +0,0 @@
-## Script (Python) "PaySheetTransaction_getReportLineList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-report_items = context.PaySheetTransaction_zGetDetailedTotal()
-
-report_lines = []
-
-# scan every sql report item
-for item in report_items:
-    line =  { 'title'               : None
-            , 'employer_totalbase'  : None
-            , 'employer_rate'       : None
-            , 'employer_total'      : None
-            , 'employee_totalbase'    : None
-            , 'employee_rate'         : None
-            , 'employee_total'        : None
-            , 'total'               : None
-            }
-    # sort by employer/salary share
-    if item['variation_text'].find('employee_share') != -1:
-        line['title']               = item['parent_title']
-        line['employee_totalbase']    = item['base']
-        line['employee_rate']         = item['rate']
-        line['employee_total']        = item['total_price']
-    if item['variation_text'].find('employer_share') != -1:
-        line['title']               = item['parent_title']
-        line['employer_totalbase']  = item['base']
-        line['employer_rate']       = item['rate']
-        line['employer_total']      = item['total_price']
-    report_lines.append(line)
-
-# scan every line and group them
-
-#here.portal
-
-# first grouping:
-
-
-return report_lines
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_initializePreview.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_initializePreview.py
deleted file mode 100755
index 8e9a2cfd6fda19f0406968a4963f6632efc9686a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_initializePreview.py
+++ /dev/null
@@ -1,98 +0,0 @@
-## Script (Python) "PaySheetTransaction_initializePreview"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=**kw
-##title=
-##
-import random
-from Products.ERP5Type.Document import newTempBase
-from string import zfill
-
-global portal_object, num, l
-portal_object = context.getPortalObject()
-num = 0
-l = []
-
-# get all pre-calculated rates and bases
-default_values = context.PaySheetTransaction_preCalculation()
-
-# function to create a new preview line
-def createPreviewLine   ( new_id                = None
-                        , new_title             = None
-                        , new_base              = None
-                        , new_base_name         = None
-                        , new_employee_rate     = None
-                        , new_employer_rate     = None
-                        , new_service_url       = None
-                        , new_organisation_url  = None
-                        , new_salary_range_cat  = None
-                        , new_tax_cat           = None
-                        ):
-    global portal_object, num, l
-    num += 1
-    int_len = 3
-    o = newTempBase(portal_object, new_id)
-    o.setUid('new_%s' % zfill(num, int_len))
-    o.edit(uid='new_%s' % zfill(num, int_len))
-    o.edit  ( id                    = new_id
-            , title                 = new_title
-            , base                  = new_base
-            , base_name             = new_base_name
-            , employee_share_rate   = new_employee_rate
-            , employer_share_rate   = new_employer_rate
-            , service_url           = new_service_url
-            , organisation_url      = new_organisation_url
-            , salary_range_cat      = new_salary_range_cat
-            , tax_cat               = new_tax_cat
-            )
-    l.append(o)
-
-# get all services related to pay sheet transaction
-paysheet_services = []
-erp5site = context.portal_url.getPortalObject()
-for service in erp5site['service'].objectValues():
-    base_cat = service.getVariationRangeBaseCategoryList()
-    # a service is related to paysheet transaction if it has 'tax_category' et 'salary_range' as base category
-    if 'tax_category' in base_cat and 'salary_range' in base_cat:
-        paysheet_services.append(service)
-
-# Sort the service list by id
-paysheet_services.sort(lambda x, y: cmp(x.getId(), y.getId()))
-
-# generate all lines for the preview form
-for serv in paysheet_services:
-    cat_list = serv.getCategoryList()
-    # store all categories of the service into lists
-    tax_cat     = []
-    range_cat   = []
-    for cat in cat_list:
-        if str(cat).find('tax_category') != -1:
-            tax_cat.append(cat)
-        if str(cat).find('salary_range') != -1:
-            range_cat.append(cat)
-    # create a line for every salary_range of the service
-    for base in range_cat:
-        name = serv.getId() + '/' + context.portal_categories.resolveCategory(base).getId()
-        # a preview line is composed of a base calculation, an employee share rate and an employer share rate
-        if default_values.has_key(name):
-            new_base            = default_values[name]['base']
-            new_employee_rate   = default_values[name]['employee_rate']
-            new_employer_rate   = default_values[name]['employer_rate']
-        # create a preview line for every salary_range value of the service
-        createPreviewLine   ( new_id                = serv.getId()
-                            , new_title             = serv.getTitleOrId()
-                            , new_base              = new_base
-                            , new_base_name         =   context.portal_categories.resolveCategory(base).getTitleOrId()
-                            , new_employee_rate     = new_employee_rate
-                            , new_employer_rate     = new_employer_rate
-                            , new_service_url       = serv.getRelativeUrl()
-                            , new_organisation_url  = serv.getSource()
-                            , new_salary_range_cat  = base
-                            , new_tax_cat           = tax_cat
-                            )
-
-# return the list of preview lines
-return l
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_pdf_template.pt b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_pdf_template.pt
deleted file mode 100755
index d2fbd18b7bb07f78a16cef97cc271ebcf381ab11..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_pdf_template.pt
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-
-<tal:block tal:define="employee python: here.getDestinationSectionValue();
-                  employer python: here.getSourceSectionValue();
-                  paysheet_details python: here.PaySheetTransaction_getDetails();
-                  paysheet_categories python: paysheet_details['paysheet_categories'];
-                  urssaf python: employer.getDestinationSectionValue();
-                  start_date python: here.getStartDate()">
-
-
-
-  <template bottommargin='0.665cm' showboundary='0' topmargin='0.635cm' rightmargin='0.665cm' tal:define='portal python:here.portal_url.getPortalObject()' filename='paysheet.pdf' pagesize='A4' allowsplitting='1' landscape='0' leftmargin='0.635cm'>
-    
-    <stylesheet>
-      <tablestyle name="decompte">
-        <stylecmd expr="('FONTSIZE', (0,0), (-1,-1), 7)"/>
-        <stylecmd expr="('OUTLINE', (0,0), (-1,-1), 0.7, (0.4,0.4,0.4))"/>
-        <stylecmd expr="('LINEAFTER', (0,0), (-1,-1), 0.1, (0.4,0.4,0.4))"/>
-        <stylecmd expr="('LEFTPADDING', (0,0), (-1,-1), 4)"/>
-
-        <!-- Entete -->
-        <stylecmd expr="('TEXTCOLOR', (0,0), (-1,0), colors.white)"/>
-        <stylecmd expr="('FONT', (0,0), (-1,0), 'Helvetica-Bold', 7)"/>
-        <stylecmd expr="('BACKGROUND', (0,0), (-1,0), (0.4,0.4,0.4))"/>
-        <stylecmd expr="('LINEAFTER', (0,0), (-2,0), 0.1, colors.white)"/>
-        <stylecmd expr="('LEFTPADDING', (0,0), (-1,0), 0)"/>
-        <stylecmd expr="('RIGHTPADDING', (0,0), (-1,0), 0)"/>
-        <stylecmd expr="('ALIGNMENT', (0,0), (-1,0), 'CENTER')"/>
-
-        <!-- Corps -->
-        <stylecmd expr="('TOPPADDING', (0,1), (-1,-1), 2)"/>
-        <stylecmd expr="('BOTTOMPADDING', (0,1), (-1,-1), 2)"/>
-        <stylecmd expr="('BACKGROUND', (0,1), (-1,-1), (0.95, 0.95, 0.95))"/>
-        <stylecmd expr="('TEXTCOLOR', (0,1), (-1,-1), colors.black)"/>
-        <stylecmd expr="('ALIGNMENT', (-5,1), (-1,-1), 'RIGHT')"/>
-
-        <!-- Pied de tableau -->
-        <stylecmd expr="('BACKGROUND', (-1,1), (-1,-2), (0.85,0.85,0.85))"/>
-        <stylecmd expr="('BACKGROUND', (0,-1), (-2,-1), (0.85,0.85,0.85))"/>
-        <stylecmd expr="('BACKGROUND', (-1,-1), (-1,-1), (0.75,0.75,0.75))"/>
-        <stylecmd expr="('LINEABOVE', (0,-1), (-1,-1), 0.1, (0.4,0.4,0.4))"/>
-      </tablestyle>
-
-
-
-      <tablestyle name="cumul_conges">
-        <stylecmd expr="('FONTSIZE', (0,0), (-1,-1), 7)"/>
-        <stylecmd expr="('LEFTPADDING', (0,0), (-1,-1), 4)"/>
-
-        <!-- Entete gauche -->
-        <stylecmd expr="('TEXTCOLOR', (0,0), (0,0), colors.white)"/>
-        <stylecmd expr="('FONT', (0,0), (0,0), 'Helvetica-Bold', 7)"/>
-        <stylecmd expr="('BACKGROUND', (0,0), (0,0), (0.4,0.4,0.4))"/>
-        <stylecmd expr="('TOPPADDING', (0,0), (0,0), 0)"/>
-        <stylecmd expr="('BOTTOMPADDING', (0,0), (0,0), 0)"/>
-        <stylecmd expr="('ALIGNMENT', (0,0), (0,0), 'CENTER')"/>
-        <stylecmd expr="('VALIGN', (0,0), (0,0), 'MIDDLE')"/>
-        
-        
-        <!-- Premiere ligne de droite
-             <stylecmd expr="('LINEABOVE', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
-             <stylecmd expr="('LINEBEFORE', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
-             <stylecmd expr="('LINEAFTER', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
-        -->
-
-      </tablestyle>
-
-      <tablestyle name="cumul_conges_corps">
-        <stylecmd expr="('FONTSIZE', (0,0), (-1,-1), 7)"/>
-        <stylecmd expr="('LEFTPADDING', (0,0), (-1,-1), 4)"/>
-
-        <!--Tableau de gauche -->
-        <stylecmd expr="('GRID', (0,0), (4,1), 0.1, (0.4,0.4,0.4))"/>
-        <stylecmd expr="('ALIGNMENT', (0,0), (4,0), 'CENTER')"/>
-        <stylecmd expr="('ALIGNMENT', (0,1), (4,1), 'RIGHT')"/>
-
-        <!-- Deuxieme ligne de droite -->
-        <!-- <stylecmd expr="('LINEBELOW', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
-             <stylecmd expr="('LINEBEFORE', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
-             <stylecmd expr="('LINEAFTER', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
-        -->
-        <stylecmd expr="('OUTLINE', (-1,0), (-1,0), 0.1, (0.4,0.4,0.4))"/>
-        
-      </tablestyle>
-
-
-    </stylesheet>
-
-    <pagetemplate startframe='content' id='FirstPage'>
-      <static>
-        
-        <!-- ATTENTION : L'image ne doit pas etre en format png -->
-        <fixedimage filename='zodb:logo.jpg' y='27.275cm' x='1.016cm'/>
-        <infostring z='' color='(0.0,0.0,0.0)' align='center' y='27.5160804cm' x='14.208cm' font='Helvetica' size='20'>FEUILLE DE SALAIRE</infostring>
-
-        <!-- Cadre employeur -->
-        <tal:block tal:condition="python: employer not in (None, '') and employer.getPortalType() == 'Organisation'">
-          <tal:block tal:define="employer_group python: employer.getGroup()">
-            <rectangle z='' height='5.239cm' width='7.038cm' stroke='(0.4,0.4,0.4)' y='21.074cm' x='1.016cm' linewidth='1'/>
-            <line y2='23.646cm' linewidth='1' z='' x2='8.042cm' stroke='(0.6,0.6,0.6)' y1='23.646cm' x1='1.016cm'/>
-            <line y2='21.741cm' linewidth='1' z='' x2='8.042cm' stroke='(0.6,0.6,0.6)' y1='21.741cm' x1='1.016cm'/>
-
-            <infostring z='' color='(0.0,0.0,0.0)' align='left' y='25.90483216cm' x='1.278cm' font='Helvetica-Bold' size='8'
-              tal:content="python: employer.getCorporateName()">Nexedi sarl</infostring>
-            <infostring z='' color='(0.0,0.0,0.0)' align='left' y='25.49483216cm' x='1.626cm' font='Helvetica' size='8'
-              tal:content="python: employer.getDefaultAddress().getStreetAddress()">943 Avenue de la République</infostring>
-            <infostring z='' color='(0.0,0.0,0.0)' align='left' y='25.21366432cm' x='1.626cm' font='Helvetica' size='8'
-              tal:content='python:employer.getDefaultAddress().getZipCode() + " " + employer.getDefaultAddress().getCity()'>59700 Marcq-en-Baroeul</infostring>
-            <infostring z='' color='(0.0,0.0,0.0)' align='left' y='24.70683216cm' x='1.27cm' font='Helvetica' size='8'
-              tal:content="python: 'Etablissement : %s' % employer_group" tal:condition="python: employer_group != None">Etablissement : nexedi</infostring>
-            <infostring z='' color='(0.0,0.0,0.0)' align='left' y='24.70683216cm' x='1.27cm' font='Helvetica' size='8'
-              tal:content="python: 'Etablissement : Etablissement principal'" tal:condition="python: employer_group == None">Etablissement : nexedi</infostring>
-            <infostring z='' color='(0.0,0.0,0.0)' align='left' y='24.42566432cm' x='1.27cm' font='Helvetica' size='8'
-              tal:content="python: 'Siret : %s' % employer.getGeographicIncorporateCode()">Siret : 440047504 00012</infostring>
-            <infostring z='' color='(0.0,0.0,0.0)' align='left' y='24.14449648cm' x='1.27cm' font='Helvetica' size='8'
-              tal:content="python: 'NAF (ex APE) : %s' % employer.getActivityCode()">NAF (ex APE) : 722Z</infostring>
-            <infostring z='' color='(0.0,0.0,0.0)' align='left' y='23.23783216cm' x='1.27cm' font='Helvetica' size='8'
-              tal:content="python: 'N°URSSAF : %s' % employer.getSocialCode()">N°URSSAF : 592 190071289 1013</infostring>
-            <infostring z='' color='(0.0,0.0,0.0)' align='left' y='22.95666432cm' x='1.27cm' font='Helvetica' size='8'
-              tal:content="python:urssaf.getTitle()">URSSAF de Roubaix-Tourcoing</infostring>
-            <infostring z='' color='(0.0,0.0,0.0)' align='left' y='22.37383216cm' x='1.626cm' font='Helvetica' size='8'
-              tal:content="python:urssaf.getDefaultAddress().getStreetAddress()">28, avenue de la Marne</infostring>
-            <infostring z='' color='(0.0,0.0,0.0)' align='left' y='22.09266432cm' x='1.626cm' font='Helvetica' size='8'
-              tal:content="python:urssaf.getDefaultAddress().getZipCode() + ' ' + urssaf.getDefaultAddress().getCity()">59208 Tourcoing</infostring>
-            <infostring z='' color='(0.0,0.0,0.0)' align='left' y='21.33283216cm' x='1.27cm' font='Helvetica' size='8'
-              tal:content="python: 'Convention collective de branche : %s' % employee.getDefaultCollectiveAgreementTitle()">Convention collective de branche : SYNTEC</infostring>
-          </tal:block>
-        </tal:block>
-
-
-        <!-- Cadre employé -->
-        <tal:block tal:condition="python: employee not in (None, '') and employee.getPortalType() == 'Person'">
-          <rectangle z='' height='5.239cm' width='7.038cm' stroke='(0.4,0.4,0.4)' y='21.074cm' x='12.065cm' linewidth='1'/>
-          <line y2='23.994cm' linewidth='1' z='' x2='19.099cm' stroke='(0.6,0.6,0.6)' y1='23.994cm' x1='12.073cm'/>
-          <line y2='22.165cm' linewidth='1' z='' x2='19.099cm' stroke='(0.6,0.6,0.6)' y1='22.165cm' x1='12.073cm'/>
-
-          <infostring z='' color='(0.0,0.0,0.0)' align='left' y='25.91383216cm' x='12.327cm' font='Helvetica-Bold' size='8'
-            tal:content="python: employee.getTitle()">Sébastien Robin</infostring>
-          <infostring z='' color='(0.0,0.0,0.0)' align='left' y='25.50383216cm' x='12.675cm' font='Helvetica' size='8'
-            tal:content="python:employee.getDefaultAddress().getStreetAddress()">11, rue des chaudrons</infostring>
-          <infostring z='' color='(0.0,0.0,0.0)' align='left' y='25.22266432cm' x='12.675cm' font='Helvetica' size='8'
-            tal:content="python:employee.getDefaultAddress().getZipCode() + ' ' + employee.getDefaultAddress().getCity()">59300 Valenciennes</infostring>
-          <infostring z='' color='(0.0,0.0,0.0)' align='left' y='24.29683216cm' x='12.327cm' font='Helvetica' size='8'
-            tal:content="python: 'N°Secu.Soc. : %s' % employee.getSocialCode()">N°Secu.Soc. : 1 80 04 85 047 027 25</infostring>
-          <infostring z='' color='(0.0,0.0,0.0)' align='left' y='23.58583216cm' x='12.327cm' font='Helvetica' size='8'
-            tal:content="python: 'Emploi : %s' % employee.getDefaultCareerTitle()">Emploi : Directeur Technique</infostring>
-          <infostring z='' color='(0.0,0.0,0.0)' align='left' y='23.30466432cm' x='12.327cm' font='Helvetica' size='8'
-            tal:content="python: 'Qualification : %s' % employee.getCareerGrade().split('/')[-1:][0]">Qualification : ingenieur</infostring>
-          <infostring z='' color='(0.0,0.0,0.0)' align='left' y='23.02349648cm' x='12.327cm' font='Helvetica' size='8'
-            tal:content="python: 'Echelon : %s' % employee.getDefaultCareerSalaryLevel()">Echelon : 1</infostring>
-          <infostring z='' color='(0.0,0.0,0.0)' align='left' y='22.74232864cm' x='12.327cm' font='Helvetica' size='8'
-            tal:content="python: 'Coefficient : %s' % employee.getDefaultCareerSalaryCoefficient()">Coefficient : 1</infostring>
-          <infostring z='' color='(0.0,0.0,0.0)' align='left' y='21.75683216cm' x='12.327cm' font='Helvetica' size='8'
-            tal:content="python: 'Période : du %s au %s' % (start_date, here.getStopDate())">Période : du 2003/11/01 au 2003/11/30</infostring>
-          <infostring z='' color='(0.0,0.0,0.0)' align='left' y='21.47566432cm' x='12.327cm' font='Helvetica' size='8'
-            tal:content="python: 'Date de paiement : %s' % here.getTargetStopDate()">Date de paiement : 2003/11/04</infostring>
-        </tal:block>
-
-        <line y2='1.506cm' linewidth='1' z='' x2='19.075cm' stroke='(0.6,0.6,0.6)' y1='1.506cm' x1='1.905cm'/>
-        <infostring z='' color='(0.0,0.0,0.0)' align='center' y='1.00183216cm' x='10.4855cm' font='Helvetica' size='8'>Dans votre intérêt et pour vous aider à faire valoir vos droits, conservez ce bulletin de paie sans limitation de durée.</infostring>
-      </static>
-      <frame showBoundary='0' leftpadding='0.1cm' height='18.74cm' width='19.701cm' rightpadding='0.1cm' y='1.689cm' x='0.635cm' nextid='content' toppadding='0.2cm' id='content' bottompadding='0.5cm'/>
-    </pagetemplate>
-  </template>
-</tal:block>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_postCalculation.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_postCalculation.py
deleted file mode 100755
index aad94e3010c2fad29dbd7b1c247076e6095d4757..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_postCalculation.py
+++ /dev/null
@@ -1,157 +0,0 @@
-## Script (Python) "PaySheetTransaction_postCalculation"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=listbox=[], **kw
-##title=
-##
-True  = 1
-False = 0
-
-global paysheet
-paysheet           = context.getObject()
-paysheet_type      = paysheet.getPortalType()
-
-paysheet_line_type = 'Pay Sheet Line'
-paysheet_cell_type = 'Pay Sheet Cell'
-
-employee            = paysheet.getDestinationSection()
-employee_object     = paysheet.getDestinationSectionValue()
-employer            = paysheet.getSourceSection()
-employer_object     = paysheet.getSourceSectionValue()
-
-
-
-# delete all objects in the paysheet
-id_list = []
-for paysheet_item in paysheet.objectValues():
-    id_list.append(paysheet_item.getId())
-paysheet.manage_delObjects(id_list)
-
-
-
-# this function register all paysheet informations in paysheet lines and cells
-def createPaySheetItem(title='', res='', dest_org='', cells=[]):
-    global paysheet
-    # select good cells only
-    good_cells = []
-    for cell in cells:
-        if cell["base"] not in ('', 0, None) and cell["rate"] not in ('', 0, None):
-            good_cells.append(cell)
-    if len(good_cells) == 0:
-        return
-    # get all variation categories used in cells
-    var_cat_list = []
-    for cell in good_cells:
-        var_cat_list.append(cell["x"])
-        var_cat_list.append(cell["y"])
-    # add a new Pay Sheet Line
-    payline = paysheet.newContent( portal_type                  = 'Pay Sheet Line'
-                                 , title                        = title
-                                 , resource                     = res
-                                 , destination_section          = dest_org
-                                 , destination                  = dest_org
-                                 , variation_base_category_list = ('tax_category', 'salary_range')
-                                 , variation_category_list      = var_cat_list
-                                 )
-    # fill each cell with values
-    for cell in good_cells:
-        paycell = payline.getCell(cell["x"], cell["y"], base_id = 'movement')
-        paycell.edit(quantity=-cell["base"], price=cell["rate"]/100.0)
-
-
-
-# set the title of the paysheet if empty
-months = ['janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre']
-if paysheet.getTitle() in ('', None):
-    new_title = 'Salaire ' + str(employee_object.getTitle())
-    if paysheet.getStartDate() not in ('', None):
-        new_title = ' ' + months[int(str(paysheet.getStartDate())[5:7])-1] + ' ' + str(paysheet.getStartDate())[0:4]
-    paysheet.setTitle(new_title)
-
-
-
-# get the ordered list of standard preview line objects
-std_lines = context.PaySheetTransaction_initializePreview()
-
-
-# this list contain all paysheet items, indexed by service
-paysheet_items = {}
-
-# scan every standard preview line to create an item for each service
-for std_line in std_lines:
-    # get the service url (unique because containing the id)
-    service = std_line.getProperty('service_url')
-    # verify that the service is not existing
-    if not paysheet_items.has_key(service):
-        # create a temporary service item
-        temp_item = {}
-        # fill the new item with needed data
-        temp_item['title']      = std_line.getProperty('title')
-        temp_item['res']        = std_line.getProperty('service_url')
-        temp_item['dest_org']   = std_line.getProperty('organisation_url')
-        temp_item['cells']      = []
-        # add the new service item to the list
-        paysheet_items[service] = temp_item
-
-# initialise the user preview line index
-user_line_index = 0
-
-# scan every standard preview line and get the correspondant user preview line to put user parameters in appropriate cells
-for std_line in std_lines:
-    # define some values related to current standard preview line
-    service             = std_line.getProperty('service_url')
-    salary_range_cat    = std_line.getProperty('salary_range_cat')
-    tax_cat             = std_line.getProperty('tax_cat')
-    # increment the user line index: we can use this strategy because preview lines (user or standard ones) are sorted
-    user_line_index += 1
-    # get user paysheet parameters stored in user preview line (=listbox)
-    for user_line in listbox:
-        # Base_viewSearchResultList the user preview line corresponding to the standard preview line
-        if user_line.has_key('listbox_key') and int(user_line['listbox_key'])==user_line_index:
-            # got it ! we have the right line
-            # get the base salary
-            base = user_line['base']
-            # scan allowed tax categories to get employee and/or employer share rate
-            for cat in tax_cat:
-                # define an empty new cell
-                new_cell = None
-                mployee_r = user_line['employee_share_rate']
-                mployer_r = user_line['employer_share_rate']
-                if str(cat).find('employer_share') != -1 and mployer_r not in (None, ''):
-                    new_cell =  { "x"       : cat
-                                , "y"       : salary_range_cat
-                                , "base"    : base
-                                , "rate"    : mployer_r
-                                }
-                if str(cat).find('employee_share') != -1 and mployee_r not in (None, ''):
-                    new_cell =  { "x"       : cat
-                                , "y"       : salary_range_cat
-                                , "base"    : base
-                                , "rate"    : mployee_r
-                                }
-                # add the cell to the conresponding paysheet item
-                if new_cell != None:
-                    paysheet_items[service]['cells'].append(new_cell)
-
-# create a paysheet item for each service with user data in it
-for item in paysheet_items:
-    if paysheet_items[item]['cells'] not in ([], None, ''):
-        #print item
-        createPaySheetItem  ( title     = paysheet_items[item]['title']
-                            , res       = paysheet_items[item]['res']
-                            , dest_org  = paysheet_items[item]['dest_org']
-                            , cells     = paysheet_items[item]['cells']
-                            )
-
-
-# calculation of all paysheet transaction lines
-#get_transaction().commit()
-#context.PaySheetTransaction_generatePaySheetTransactionLineList()
-
-context.immediateReindexObject()
-
-# return to pay sheet
-return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '?portal_status_message=Pay+sheet+calculation+done.')
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_preCalculation.py b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_preCalculation.py
deleted file mode 100755
index 65f3a366c9891efc6428908edefbdab25628b50c..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_preCalculation.py
+++ /dev/null
@@ -1,356 +0,0 @@
-## Script (Python) "PaySheetTransaction_preCalculation"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=ags_rate=None, industrial_accident_rate=None, transport_payment_rate=None, syntec_rate=None
-##title=
-##
-True  = 1
-False = 0
-
-global paysheet
-paysheet      = context.getObject()
-paysheet_type = paysheet.getPortalType()
-
-employee        = paysheet.getDestinationSection()
-employee_object = paysheet.getDestinationSectionValue()
-employer        = paysheet.getSourceSection()
-employer_object = paysheet.getSourceSectionValue()
-
-
-gross_salary = abs(paysheet.getGrossSalary())
-
-# check if the employee is executive or not
-if employee_object.getCareerGrade().split('/')[-1:][0] in ('engineer'):
-  executive = True
-else:
-  executive = False
-
-company_birth = employer_object.getCreationDate()
-
-employer_region = employer_object.getDefaultAddress().getZipCode()[:2]
-
-# get the number of person which are employed by the company ,
-# sub_list = employer_object.getSubordinationRelatedValueList()
-# company_size = 0
-# for person in sub_list:
-#   if person.getPortalType() == 'Person': # add condition: if current role == internal and defaultCareerEnd and defaultCareerStart fit in the current year
-#     #print repr(person) + repr(person.getTitle())
-#     company_size += 1
-#
-# print repr(company_size)
-#
-# return printed
-
-company_size = 3
-
-
-# limited salary = salaire plafonné
-if gross_salary < 2432:     #!!! depending of the wage periodicity, 2432 euros is for a month
-  limited_salary = gross_salary
-else:
-  limited_salary = 2432
-
-# "Char" slice type
-slice_a_value = 2432
-slice_b_value = 9728
-slice_c_value = 19456
-char_slices = {}
-if gross_salary < slice_a_value:
-    char_slices['A'] = gross_salary
-else:
-    char_slices['A'] = slice_a_value
-    if gross_salary < slice_b_value:
-        char_slices['B'] = float(gross_salary) - float(slice_a_value)
-    else:
-        char_slices['B'] = slice_b_value
-        if gross_salary < slice_c_value:
-            char_slices['C'] = float(gross_salary) - float(slice_b_value)
-        else:
-            char_slices['C'] = slice_c_value
-
-# "Number" slice type
-slice_1_value = 2432
-slice_2_value = 7296
-num_slices = {}
-if gross_salary < slice_1_value:
-    char_slices['1'] = gross_salary
-else:
-    char_slices['1'] = slice_1_value
-    if gross_salary < slice_2_value:
-        char_slices['2'] = gross_salary - slice_1_value
-    else:
-        char_slices['2'] = slice_2_value
-
-# age-slice of the company
-old_limit = DateTime(1997, 1, 1)
-if company_birth < old_limit:
-  comp_type = 'old'
-else:
-  comp_type = 'new'
-
-
-#################
-# This script will fill the PaySheetTransaction_preview with default values for base salary calculation, employer and employee share
-#################
-
-default = {}
-# initialize all variables to None
-paysheet_services = []
-erp5site = context.portal_url.getPortalObject()
-for service in erp5site['service'].objectValues():
-    base_cat = service.getVariationRangeBaseCategoryList()
-    if 'tax_category' in base_cat and 'salary_range' in base_cat:
-        paysheet_services.append(service)
-for serv in paysheet_services:
-    cat_list = serv.getCategoryList()
-    tax_cat = []
-    range_cat = []
-    for cat in cat_list:
-        if str(cat).find('tax_category') != -1:
-            tax_cat.append(cat)
-        if str(cat).find('salary_range') != -1:
-            range_cat.append(cat)
-    for base in range_cat:
-        new_name = serv.getId() + '/' + context.portal_categories.resolveCategory(base).getId()
-        default[new_name] = {'employer_rate':None,'employee_rate':None,'base':None}
-
-# sickness insurance
-if employer_region in ('57', '67', '68'):
-    er = 1.70
-else:
-    er = 0.75
-default['sickness_insurance/salaire_brut'] = \
-{ 'employer_rate' : 12.80
-, 'employee_rate' : er
-, 'base'          : gross_salary
-}
-
-# old-age insurance
-default['oldage_insurance/salaire_brut'] = \
-{ 'employer_rate'          : 1.60
-, 'employee_rate'          : None
-, 'base'        : gross_salary
-}
-default['oldage_insurance/salaire_plafonne'] = \
-{ 'employer_rate'  : 8.20
-, 'employee_rate'  : 6.55
-, 'base': limited_salary
-}
-
-# widowhood insurance
-default['widowhood_insurance/salaire_brut'] = \
-{ 'employer_rate'          : None
-, 'employee_rate'          : 0.10
-, 'base'        : gross_salary
-}
-
-# family benefits
-default['family_benefits/salaire_brut'] = \
-{ 'employer_rate'          : 5.40
-, 'employee_rate'          : None
-, 'base'        : gross_salary
-}
-
-# industrial accident
-# industrial_accident_rate is a parameter of this script, because rate depending of company size, department & trade (1.10 is for Nexedi, 1.0 is the default value)
-if industrial_accident_rate in ('', 0, None):
-    industrial_accident_rate = 1.0
-default['industrial_accident/salaire_brut'] = \
-{ 'employer_rate'          : industrial_accident_rate
-, 'employee_rate'          : None
-, 'base'        : gross_salary
-}
-
-# lodging helps
-if company_size > 9:
-    default['lodging_helps/salaire_brut'] = \
-    { 'employer_rate'          : 0.40
-    , 'employee_rate'          : None
-    , 'base'        : gross_salary
-    }
-else:
-    default['lodging_helps/salaire_plafonne'] = \
-    { 'employer_rate'  : 0.10
-    , 'employee_rate'          : None
-    , 'base': limited_salary
-    }
-
-# transport payment
-# TODO: rate depending of the town, 1.80 is the 'default' value (when the town isn't referenced by laws)
-if transport_payment_rate in ('', 0, None):
-    transport_payment_rate = 1.80
-if company_size > 9:
-    default['transport_payment/salaire_brut'] = \
-    { 'employer_rate'          : transport_payment_rate
-    , 'employee_rate'          : None
-    , 'base'        : gross_salary
-    }
-
-# CSG
-default['csg_deductible/salaire_brut_csg'] = \
-{ 'employer_rate'      :None
-, 'employee_rate'          :5.10
-, 'base'    : 0.95 * gross_salary
-}
-default['csg_non_deductible/salaire_brut_csg'] = \
-{ 'employer_rate'      :None,
- 'employee_rate'      : 2.4
-, 'base'    : 0.95 * gross_salary
-}
-
-# CRDS
-default['crds/salaire_brut_crds'] = \
-{ 'employer_rate':None,
-'employee_rate'     : 0.50
-, 'base'   : 0.95 * gross_salary
-}
-
-# unemployment insurance
-if char_slices.has_key('A'):
-    default['unemployment_insurance/tranche_a']['employer_rate']     = 4.0
-    default['unemployment_insurance/tranche_a']['employee_rate']     = 2.4
-    default['unemployment_insurance/tranche_a']['base']   = char_slices['A']
-if char_slices.has_key('B'):
-    default['unemployment_insurance/tranche_b']['employer_rate']     = 4.0
-    default['unemployment_insurance/tranche_b']['employee_rate']     = 2.4
-    default['unemployment_insurance/tranche_b']['base']   = char_slices['B']
-
-# AGS
-# ags_rate is a parameter of this script, 0.35% was the default value, now it's 0.45%
-if ags_rate in ('', 0, None):
-    ags_rate = 0.45
-if char_slices.has_key('A'):
-    default['ags/tranche_a']['employer_rate']      = ags_rate
-    default['ags/tranche_a']['base']    = char_slices['A']
-if char_slices.has_key('B'):
-    default['ags/tranche_b']['employer_rate']      = ags_rate
-    default['ags/tranche_b']['base']    = char_slices['B']
-
-# ARRCO
-if executive == False:
-    if num_slices.has_key('1'):
-        default['arrco/tranche_1']['employer_rate']    = 4.5
-        default['arrco/tranche_1']['employee_rate']    = 3.0
-        default['arrco/tranche_1']['base']  = num_slices['1']
-    if num_slices.has_key('2'):
-        if comp_type == 'old':
-            employee_share_rate   = 6.0
-            employer_share_rate = 9.0
-        else:
-            employee_share_rate   = 8.0
-            employer_share_rate = 12.0
-        default['arrco/tranche_2']['employer_rate']    = employer_share_rate
-        default['arrco/tranche_2']['employee_rate']    = employee_share_rate
-        default['arrco/tranche_2']['base']  = num_slices['2']
-elif char_slices.has_key('A'):
-    default['arrco/tranche_a']['employer_rate']    = 4.5
-    default['arrco/tranche_a']['employee_rate']    = 3.0
-    default['arrco/tranche_a']['base']  = char_slices['A']
-
-# AGFF
-if executive == True:
-    if char_slices.has_key('A'):
-        default['agff/tranche_a']['employer_rate']     = 1.20
-        default['agff/tranche_a']['employee_rate']     = 0.80
-        default['agff/tranche_a']['base']   = char_slices['A']
-    if char_slices.has_key('B'):
-        default['agff/tranche_b']['employer_rate']     = 1.30
-        default['agff/tranche_b']['employee_rate']     = 0.90
-        default['agff/tranche_b']['base']   = char_slices['B']
-else:
-    if num_slices.has_key('1'):
-        default['agff/tranche_1']['employer_rate']     = 1.20
-        default['agff/tranche_1']['employee_rate']     = 0.80
-        default['agff/tranche_1']['base']   = num_slices['1']
-    if num_slices.has_key('2'):
-        default['agff/tranche_2']['employer_rate']     = 1.30
-        default['agff/tranche_2']['employee_rate']     = 0.90
-        default['agff/tranche_2']['base']   = num_slices['2']
-
-# AGIRC
-# TODO: fix the repartition of share rate in case of slice C
-if executive == True:
-    if char_slices.has_key('B'):
-        default['agirc/tranche_b']['employer_rate']    = 12.50
-        default['agirc/tranche_b']['employee_rate']    = 7.50
-        default['agirc/tranche_b']['base']  = char_slices['B']
-    if char_slices.has_key('C'):
-        # free repartition (20% to share between employee & employer)
-        default['agirc/tranche_b']['employer_rate']    = 10.00
-        default['agirc/tranche_b']['employee_rate']    = 10.00
-        default['agirc/tranche_b']['base']  = char_slices['C']
-
-# CET
-if executive == True:
-    if char_slices.has_key('A'):
-        default['cet/tranche_a']['employer_rate']    = 0.22
-        default['cet/tranche_a']['employee_rate']    = 0.13
-        default['cet/tranche_a']['base']  = char_slices['A']
-    if char_slices.has_key('B'):
-        default['cet/tranche_b']['employer_rate']    = 0.22
-        default['cet/tranche_b']['employee_rate']    = 0.13
-        default['cet/tranche_b']['base']  = char_slices['B']
-    if char_slices.has_key('C'):
-        default['cet/tranche_c']['employer_rate']    = 0.22
-        default['cet/tranche_c']['employee_rate']    = 0.13
-        default['cet/tranche_c']['base']  = char_slices['C']
-
-# life insurance
-if executive == True and char_slices.has_key('A'):
-    default['life_insurance/tranche_a'] = \
-    { 'employer_rate'      : 1.5
-    , 'employee_rate': None
-    , 'base'    : char_slices['A']
-    }
-
-# APEC
-if char_slices.has_key('B'):
-    default['apec/tranche_b'] = \
-    { 'employer_rate'      : 0.036
-    , 'employee_rate'      : 0.024
-    , 'base'    : char_slices['B']
-    }
-
-# construction tax
-if company_size > 9:
-    default['construction_tax/salaire_brut'] = \
-    { 'employer_rate'      : 0.45
-    , 'employee_rate': None
-    , 'base'    : gross_salary
-    }
-
-# training tax
-default['training_tax/salaire_brut'] = \
-{ 'employer_rate'      : 0.50
-, 'employee_rate': None
-, 'base'    : gross_salary
-}
-
-# courses tax
-if company_size < 10:
-    rate = 0.15
-else:
-    rate = 1.5
-default['courses_tax/salaire_brut'] = \
-{ 'employer_rate'      : rate
-, 'employee_rate':None
-, 'base'    : gross_salary
-}
-
-# Syntec convention
-#syntec_rate = 0.915
-# XXX If it is the paysheet of yoshinory , we do *2 because he is married.
-# if married(employee) : syntec_rate = syntec_rate * 2
-#syntec_rate = 1.83
-if syntec_rate in ('', 0, None):
-    syntec_rate = 0.915
-default['syntec_insurance/salaire_plafonne_syntec'] = \
-{ 'employer_rate'   : syntec_rate
-, 'employee_rate'   : syntec_rate
-, 'base' : 2432
-}
-
-return default
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_print_old.pt b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_print_old.pt
deleted file mode 100755
index 492bdcc1384332718929fbf918385397827505bd..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_print_old.pt
+++ /dev/null
@@ -1,233 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html tal:define="employee python: here.restrictedTraverse(here.getDestinationSectionRelativeUrl());
-                  employer python: here.restrictedTraverse(here.getSourceSectionRelativeUrl());
-                  paysheet_details python: here.PaySheetTransaction_getDetails();
-                  paysheet_categories python: paysheet_details['paysheet_categories'];
-                  urssaf python: here.restrictedTraverse(employer.getDestinationSection());
-                  start_date python: here.getStartDate()">
-  <head>
-    <meta http-equiv="content-type" content="text/html;charset=ISO-8859-1">
-    <title tal:content="python: here.getTitleOrId()"/>
-    <style type="text/css">@import "PaySheet.css";</style>
-  </head>
-
-  <body>
-
-  <div class="page">
-
-  <div class="logotitle">
-    <table width="100%">
-      <tr>
-        <td><img src="logo.png"></td>
-        <td><h1>FEUILLE DE SALAIRE</h1></td>
-      </tr>
-    </table>
-  </div>
-
-  <div class="left" tal:condition="python: employer not in (None, '') and employer.getPortalType() == 'Organisation'">
-    <div class="details" tal:define="employer_group python: employer.getGroup()">
-      <p>
-        <span class="name" tal:content="python: employer.getCorporateName()"/><br/>
-        <span id="sub" tal:content="python: employer.getDefaultAddress().getStreetAddress()"/><br/>
-        <span id="sub" tal:content="python: employer.getDefaultAddress().getZipCode() + ' ' + employer.getDefaultAddress().getCity()"/><br/>
-        <span tal:replace="python: 'Etablissement : %s' % employer_group" tal:condition="python: employer_group != None"/><span tal:replace="python: 'Etablissement : Etablissement principal'" tal:condition="python: employer_group == None"/><br/>
-        <!--span tal:replace="python: 'Tel : %s' % employer.getDefaultTelephone().asText()"/><br/><!--optional-->
-        <!--span tal:replace="python: 'Fax : %s' % employer.getDefaultFax().asText()"/><br/><!--optional-->
-        <!--span tal:replace="python: 'E-mail : %s' % employer.getDefaultEmail().asText()"/><br/><!--optional-->
-        <span tal:replace="python: 'Siret : %s' % employer.getGeographicIncorporateCode()"/><br/>
-        <span tal:replace="python: 'NAF (ex APE) : %s' % employer.getActivityCode()"/><br/>
-      </p>
-      <div class="topline">
-        <p>
-          <span tal:replace="python: 'N°URSSAF : %s' % employer.getSocialCode()"/><br/>
-          <span tal:replace="python:urssaf.getTitle()"/><br/>
-          <span id="sub" tal:content="python:urssaf.getDefaultAddress().getStreetAddress()"/><br/>
-          <span id="sub" tal:content="python:urssaf.getDefaultAddress().getZipCode() + ' ' + urssaf.getDefaultAddress().getCity()"/><br/>
-        </p>
-      </div>
-      <div class="topline">
-        <p>
-          <span tal:replace="python: 'Convention collective de branche : %s' % employee.getDefaultCollectiveAgreementTitle()"/><br/>
-        </p>
-      </div>
-    </div>
-  </div>
-
-  <div class="right" tal:condition="python: employee not in (None, '') and employee.getPortalType() == 'Person'">
-    <div class="details">
-      <p>
-        <span class="name" tal:content="python: employee.getTitle()"/><br/>
-        <span id="sub" tal:content="python:employee.getDefaultAddress().getStreetAddress()"/><br/>
-        <span id="sub" tal:content="python:employee.getDefaultAddress().getZipCode() + ' ' + employee.getDefaultAddress().getCity()"/><br/>
-        <!--span tal:replace="python: 'Tel : %s' % employee.getDefaultTelephone().asText()"/><br/><!--optional-->
-        <!--span tal:replace="python: 'Fax : %s' % employee.getDefaultFax().asText()"/><br/><!--optional-->
-        <!--span tal:replace="python: 'E-mail : %s' % employee.getDefaultEmail().asText()"/><br/><!--optional-->
-        <span tal:replace="python: 'N°Secu.Soc. : %s' % employee.getSocialCode()"/><br/>
-      </p>
-      <div class="topline">
-        <p>
-          <!--span tal:replace="python: 'Matricule : %s' % employee.getId()"/><br/><!--optional-->
-          <span tal:replace="python: 'Emploi : %s' % employee.getDefaultCareerTitle()"/><br/>
-          <span tal:replace="python: 'Qualification : %s' % employee.getCareerGrade().split('/')[-1:][0]"/><br/>
-          <span tal:replace="python: 'Echelon : %s' % employee.getDefaultCareerSalaryLevel()"/><br/>
-          <span tal:replace="python: 'Coefficient : %s' % employee.getDefaultCareerSalaryCoefficient()"/><br/>
-        </p>
-      </div>
-      <div class="topline">
-        <p>
-          <span tal:replace="python: 'Periode : du %s au %s' % (start_date, here.getStopDate())"/><br/>
-          <span tal:replace="python: 'Date de paiement : %s' % here.getTargetStopDate()"/><br/>
-          <!--span>Type de paiement: ???</span><br/><!--optional-->
-        </p>
-      </div>
-    </div>
-  </div>
-
-  <div class="spacer">&nbsp;</div>
-
-  <br/>
-  <br/>
-
-  <table width="100%" cellspacing="0" class="data">
-    <tr class="header">
-      <td class="text">Nature</td>
-      <td class="text">Assiette</td>
-      <td class="number">Montant</td>
-      <td class="number">Taux part patronale</td>
-      <td class="number">Part patronale</td>
-      <td class="number">Taux part salariale</td>
-      <td class="number">Part salariale</td>
-    </tr>
-    <tr class="subtotal">
-      <td class="text">Salaire brut</td>
-      <td class="text">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number"><tal:block replace="python: '%.2f' % paysheet_details['gross_salary']" condition="python: paysheet_details['gross_salary'] not in (None, '')">&nbsp;</tal:block></td>
-    </tr>
-    <tal:block condition="python: paysheet_categories.has_key('no_cat')">
-      <tal:block define="no_cat_lines python: paysheet_categories['no_cat']['lines']">
-        <tr tal:repeat="line no_cat_lines">
-          <td class="text" id="sub"><tal:block content="python: line['title']"/></td>
-          <td class="text"><tal:block content="python: line['base_name']"/></td>
-          <td class="number"><tal:block replace="python: '%.2f' % line['base']"  condition="python: line['base'] not in (None, '')">&nbsp;</tal:block></td>
-          <td class="number"><tal:block replace="python: '%.3f %%' % line['employer_share_rate']" condition="python: line['employer_share_rate'] not in (None, '')">&nbsp;</tal:block></td>
-          <td class="number"><tal:block replace="python: '%.2f' % line['employer_share']" condition="python: line['employer_share'] not in (None, '')">&nbsp;</tal:block></td>
-          <td class="number"><tal:block replace="python: '%.3f %%' % line['employee_share_rate']" condition="python: line['employee_share_rate'] not in (None, '')">&nbsp;</tal:block></td>
-          <td class="number"><tal:block replace="python: '%.2f' % line['employee_share']" condition="python: line['employee_share'] not in (None, '')">&nbsp;</tal:block></td>
-        </tr>
-      </tal:block>
-    </tal:block>
-    <tal:block repeat="category paysheet_categories">
-      <tr class="category">
-        <td class="text"><tal:block content="python: paysheet_categories[category]['title']"/></td>
-        <td class="text">&nbsp;</td>
-        <td class="number">&nbsp;</td>
-        <td class="number">&nbsp;</td>
-        <td class="number">&nbsp;</td>
-        <td class="number">&nbsp;</td>
-        <td class="number">&nbsp;</td>
-      </tr>
-      <tal:block define="paysheet_lines python: paysheet_categories[category]['lines']">
-        <tr tal:repeat="line paysheet_lines">
-          <td class="text" id="sub"><tal:block content="python: line['title']"/></td>
-          <td class="text"><tal:block content="python: line['base_name']"/></td>
-          <td class="number"><tal:block replace="python: '%.2f' % line['base']"  condition="python: line['base'] not in (None, '')">&nbsp;</tal:block></td>
-          <td class="number"><tal:block replace="python: '%.3f %%' % line['employer_share_rate']" condition="python: line['employer_share_rate'] not in (None, '')">&nbsp;</tal:block></td>
-          <td class="number"><tal:block replace="python: '%.2f' % line['employer_share']" condition="python: line['employer_share'] not in (None, '')">&nbsp;</tal:block></td>
-          <td class="number"><tal:block replace="python: '%.3f %%' % line['employee_share_rate']" condition="python: line['employee_share_rate'] not in (None, '')">&nbsp;</tal:block></td>
-          <td class="number"><tal:block replace="python: '%.2f' % line['employee_share']" condition="python: line['employee_share'] not in (None, '')">&nbsp;</tal:block></td>
-        </tr>
-      </tal:block>
-    </tal:block>
-    <tr class="subtotal">
-      <td class="text">Total des cotisations</td>
-      <td class="text">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number"><tal:block replace="python: '-%.2f' % paysheet_details['total_employer_share']" condition="python: paysheet_details['total_employer_share'] not in ('', None)">&nbsp;</tal:block></td>
-      <td class="number">&nbsp;</td>
-      <td class="number"><tal:block replace="python: '-%.2f' % paysheet_details['total_employee_share']" condition="python: paysheet_details['total_employee_share'] not in ('', None)">&nbsp;</tal:block></td>
-    </tr>
-    <tr class="total">
-      <td class="text">Salaire Net</td>
-      <td class="text">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number"><tal:block replace="python: '%.2f' % paysheet_details['net_salary']" condition="python: paysheet_details['net_salary'] not in ('', None)">&nbsp;</tal:block></td>
-    </tr>
-    <tal:block repeat="category paysheet_categories">
-      <tal:block define="paysheet_lines python: paysheet_categories[category]['lines']">
-        <tal:block repeat="line paysheet_lines">
-          <tr tal:condition="python: line.has_key('taxable') and line['taxable']=='yes'">
-            <td class="text"><tal:block content="python: line['title']"/></td>
-            <td class="text"><tal:block content="python: line['base_name']"/></td>
-            <td class="number"><tal:block replace="python: '%.2f' % line['base']" condition="python: line['base'] not in ('', None)">&nbsp;</tal:block></td>
-            <td class="number">&nbsp;</td>
-            <td class="number">&nbsp;</td>
-            <td class="number"><tal:block replace="python: '%.3f %%' % line['employee_share_rate']" condition="python: line['employee_share_rate'] not in ('', None)">&nbsp;</tal:block></td>
-            <td class="number"><tal:block replace="python: '+%.2f' % abs(float(line['employee_share']))" condition="python: line['employee_share'] not in ('', None)">&nbsp;</tal:block></td>
-          </tr>
-        </tal:block>
-      </tal:block>
-    </tal:block>
-    <tr class="total">
-      <td class="text">Salaire Net Imposable</td>
-      <td class="text">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number">&nbsp;</td>
-      <td class="number"><tal:block replace="python: '%.2f' % paysheet_details['taxable_net_salary']" condition="python: paysheet_details['taxable_net_salary'] not in ('', None)">&nbsp;</tal:block></td>
-    </tr>
-  </table>
-
-  <br/>
-  <br/>
-
-  <div class="left">
-    <table cellspacing="0" class="yearly-sum">
-      <caption tal:content="python: 'Cumuls annuels (%s)' % start_date.year()" tal:condition="python: start_date not in ('', None)"/>
-      <tr class="header">
-        <td>Salaire brut</td>
-        <td>Cotisations salariales</td>
-        <td>Salaire net</td>
-        <td>Net imposable</td>
-        <td>Part patronale</td>
-      </tr>
-      <tr class="total">
-        <td><tal:block replace="python: '%.2f' % paysheet_details['yearly_gross_salary']" condition="python: paysheet_details['yearly_gross_salary'] not in ('', None)">&nbsp;</tal:block></td>
-        <td><tal:block replace="python: '%.2f' % paysheet_details['yearly_employee_share']" condition="python: paysheet_details['yearly_employee_share'] not in ('', None)">&nbsp;</tal:block></td>
-        <td><tal:block replace="python: '%.2f' % paysheet_details['yearly_net_salary']" condition="python: paysheet_details['yearly_net_salary'] not in ('', None)">&nbsp;</tal:block></td>
-        <td><tal:block replace="python: '%.2f' % paysheet_details['yearly_taxable_net_salary']" condition="python: paysheet_details['yearly_taxable_net_salary'] not in ('', None)">&nbsp;</tal:block></td>
-        <td><tal:block replace="python: '%.2f' % paysheet_details['yearly_employer_share']" condition="python: paysheet_details['yearly_employer_share'] not in ('', None)">&nbsp;</tal:block></td>
-      </tr>
-    </table>
-  </div>
-
-  <div class="right">
-    <div class="details">
-      <p>
-        <span tal:replace="python: 'Durée des congés payés : ???'"/><br/>
-        <span tal:replace="python: 'Durée des délais de préavis : ???'"/><br/>
-      </p>
-    </div>
-  </div>
-
-  <div class="spacer">&nbsp;</div>
-
-  <br/>
-  <br/>
-
-  <div class="disclaimer">
-  Dans votre intérêt et pour vous aider à faire valoir vos droits, conservez ce bulletin de paie sans limitation de durée.
-  </div>
-
-  </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_view.form b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_view.form
deleted file mode 100755
index 5d1dc3c930beeb214b40ac41247e607ea79ac317..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_view.form
+++ /dev/null
@@ -1,354 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Pay Sheet Transaction</title>
-  <row_length>4</row_length>
-  <name>PaySheetTransaction_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>ID</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <read_only type="int">0</read_only>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Employer</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>person</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <portal_type type="list">[('Person', 'Person')]</portal_type>
-          <read_only type="int">0</read_only>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Employee</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_gross_salary</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Gross Salary (Euros)</title>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Begin</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">1</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>End</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_target_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">1</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Payment date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'ID'), ('getTitle', 'Tax title'), ('getSourceSectionTitle', 'Source'), ('getDestinationSectionTitle', 'Destination'), ('getQuantity', 'Amount (in euros)')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description>Details of contributions based on salary.</description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">200</lines>
-          <list_action>list</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <not_viewable type="int">0</not_viewable>
-          <portal_types type="list">[('Pay Sheet Line', 'Pay Sheet Line')]</portal_types>
-          <read_only type="int">0</read_only>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>paysheet_line_list_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns type="list">[]</stat_columns>
-          <stat_method></stat_method>
-          <title>Pay Sheet Details</title>
-          <url_columns type="list">[]</url_columns>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_viewAnnualReportAsHTML.pt b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_viewAnnualReportAsHTML.pt
deleted file mode 100755
index e62fe8045d82b730c04a05b19579596778f1a11a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_viewAnnualReportAsHTML.pt
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html tal:define="report_items python: here.PaySheetTransaction_getReportLineList()">
-    <head>
-        <meta http-equiv="content-type" content="text/html;charset=ISO-8859-1">
-        <title>Pay Sheet Annual Report</title>
-        <style type="text/css">@import "PaySheet.css";</style>
-    </head>
-
-    <body>
-
-    <div class="spacer">&nbsp;</div>
-
-    <div class="logotitle">
-    <table width="100%">
-      <tr>
-        <td><img src="logo.png"></td>
-        <td><h1>Rapport Annuel: Charges à payer par caisses</h1></td>
-      </tr>
-    </table>
-    </div>
-
-    <div class="spacer">&nbsp;</div>
-
-    <table>
-      <tr class="big-header">
-        <th>Caisse</th>
-        <th>Base patronale</th>
-        <th>Taux patronal</th>
-        <th>Part patronale</th>
-        <th>Base salariale</th>
-        <th>Taux salarial</th>
-        <th>Part salariale</th>
-        <th>Total</th>
-      </tr>
-      <tr class="line" tal:repeat="item python: report_items">
-        <td class="line-data"><span tal:content="python: item['title']"/></td>
-        <td class="line-data"><span tal:content="python: item['employer_totalbase']"/></td>
-        <td class="line-data"><span tal:content="python: item['employer_rate']"/></td>
-        <td class="line-data"><span tal:content="python: item['employer_total']"/></td>
-        <td class="line-data"><span tal:content="python: item['employee_totalbase']"/></td>
-        <td class="line-data"><span tal:content="python: item['employee_rate']"/></td>
-        <td class="line-data"><span tal:content="python: item['employee_total']"/></td>
-        <td class="line-data"><span tal:content="python: item['total']"/></td>
-      </tr>
-    </table>
-
-  </body>
-</html>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_viewPreview.form b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_viewPreview.form
deleted file mode 100755
index 17dda2a9dd04fb210e5d0879896fe5197c6a7140..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_viewPreview.form
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Calculate the Pay Sheet Transaction</title>
-  <row_length>4</row_length>
-  <name>PaySheetTransaction_postCalculation</name>
-  <pt>form_view_dialog</pt>
-  <action>PaySheetTransaction_postCalculation</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype>multipart/form-data</enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[('title', 'Tax title'), ('base_name', 'Base name'), ('base', 'Base value'), ('employer_share_rate', 'Employer share rate'), ('employee_share_rate', 'Employee share rate')]</all_columns>
-          <all_editable_columns type="list">[('base', 'Base value'), ('employer_share_rate', 'Employer share rate'), ('employee_share_rate', 'Employee share rate')]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('title', 'Tax title'), ('base_name', 'Base name'), ('base', 'Base value'), ('employer_share_rate', 'Employer share rate'), ('employee_share_rate', 'Employee share rate')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('base', 'Base value'), ('employer_share_rate', 'Employer share rate'), ('employee_share_rate', 'Employee share rate')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">100</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">PaySheetTransaction_initializePreview</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>pay_sheet_transaction_calcul_preview</selection_name>
-          <sort type="list">[('title', 'Tax title'), ('base_name', 'Base name')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>listbox</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>listbox_base</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">15</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Base value</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_employer_share_rate</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Employer share rate (%)</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_base_name</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Base name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>listbox_employee_share_rate</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Employee share rate (%)</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_viewTotalDestinationList.form b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_viewTotalDestinationList.form
deleted file mode 100755
index e49d5b6273b9af413a6d46ae2a159b397fec6034..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_viewTotalDestinationList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Account List</title>
-  <row_length>4</row_length>
-  <name>accounting_transaction_list</name>
-  <pt>form_list</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('target_start_date', 'target_start_date'), ('destination_title', 'destination_title'), ('variation_text', 'variation_text'), ('total_price', 'total_price')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">25</lines>
-          <list_action>list</list_action>
-          <list_method type="method">PaySheetTransaction_zGetTotalDestinationList</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>paysheet_total_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Account Listbox</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_zGetDetailedTotal.zsql b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_zGetDetailedTotal.zsql
deleted file mode 100755
index e0822d5d1a2b1e1f33c627e3cbda8ecf07e8f472..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_zGetDetailedTotal.zsql
+++ /dev/null
@@ -1,29 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:
-class_file:
-</dtml-comment>
-<params>year</params>
-SELECT
-  parent.title AS parent_title,
-  movement.variation_text AS variation_text,
-  destination.title AS destination_title,
-  movement.price AS rate,
-  - SUM(movement.quantity) AS base,
-  - SUM(movement.total_price) AS total_price
-FROM
-  catalog
-LEFT JOIN
-  movement ON (movement.uid = catalog.uid)
-LEFT JOIN 
-  catalog AS destination ON (movement.destination_uid = destination.uid)
-LEFT JOIN 
-  catalog AS parent ON (catalog.parent_uid = parent.uid)
-WHERE
-  catalog.portal_type = "Pay Sheet Cell" <dtml-if year>and YEAR(movement.target_stop_date) = <dtml-sqlvar year type="int"> </dtml-if> 
-GROUP BY
-  movement.resource_uid, movement.variation_text, movement.price
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_zGetTotalDestinationList.zsql b/product/ERP5/skins/erp5_accounting/PaySheetTransaction_zGetTotalDestinationList.zsql
deleted file mode 100755
index 035ddb40311d14301b10745db9b2482b0f1e6ff1..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheetTransaction_zGetTotalDestinationList.zsql
+++ /dev/null
@@ -1,25 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:
-class_file:
-</dtml-comment>
-<params>year</params>
-SELECT
-   YEAR(movement.target_stop_date) as target_stop_date,
-   movement.variation_text AS variation_text,
-   destination.title as destination_title,
-  - SUM(movement.total_price) as total_price
-FROM
-  catalog
-LEFT JOIN
-  movement ON (movement.uid = catalog.uid)
-LEFT JOIN 
-  catalog AS destination ON (movement.destination_uid = destination.uid)
-WHERE
-  catalog.portal_type = "Pay Sheet Cell" <dtml-if year>and YEAR(movement.target_stop_date)=<dtml-sqlvar year type="int"> </dtml-if> 
-GROUP BY
-  movement.target_stop_date, movement.destination_uid, movement.variation_text
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaySheet_calculate.py b/product/ERP5/skins/erp5_accounting/PaySheet_calculate.py
deleted file mode 100755
index 1ff396d5e43f7025614c7f5487902bf83f61b223..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheet_calculate.py
+++ /dev/null
@@ -1,514 +0,0 @@
-## Script (Python) "PaySheet_calculate"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# TODO: "#!!!" style comment
-# o replace etat by right organism
-
-True  = 1
-False = 0
-
-pay_sheet           = context.getObject()
-pay_sheet_type      = pay_sheet.getPortalType()
-pay_sheet_line_type = pay_sheet_type + ' Line'
-employee            = pay_sheet.getDestinationSection()
-employer            = pay_sheet.getSourceSection()
-employer_object     = pay_sheet.getSourceSectionValue()
-
-# social organism
-org_urssaf  = 'organisation/urssaf'
-org_assedic = 'organisation/assedic'
-org_arrco   = 'organisation/arrco'
-org_agff    = 'organisation/agff'
-org_agirc   = 'organisation/agirc'
-org_apec    = 'organisation/apec'
-org_etat    = 'organisation/etat'
-
-# gross salary source and destination
-charge_salariale = 'account/charges_salariales'
-produit_salarial = 'account/produits_salariales'
-
-# final salary source and destination
-dette_salarie   = 'account/dettes_salaries'
-creance_salarie = 'account/creances_salaries'
-
-# employer share source and destination
-charge_sociale = 'account/charges_sociales'
-produit_social = 'account/produits_sociaux'
-
-# employer + employee share source and destination
-dette_sociale   = 'account/dettes_sociales'
-creance_sociale = 'account/creances_sociales'
-
-
-
-### get the gross salary and other basic informations to calculate the paysheet
-
-gross_salary = abs(pay_sheet.getGrossSalary())
-#pay_sheet_resource = pay_sheet.getCurrency()   why it doesn't work ?????
-pay_sheet_resource = 'currency/EUR'
-
-global salary_share_total
-salary_share_total = 0.0
-
-executive = True                      ################### #!!! dynamic get
-
-company_birth = DateTime(2000, 10, 21)
-
-employer_region = employer_object.getDefaultAddress().getZipCode()[:2]
-
-sub_list = employer_object.getSubordinationRelatedValueList()
-company_size = 0
-for person in sub_list:
-  if person.getPortalType() == 'Person':
-    company_size += 1
-
-company_size = 3
-
-### define some parameters for the calculation
-
-# ceiling salary
-if gross_salary < 2432:     #!!! depending of the wage periodicity, 2432 euros is for a month
-  ceiling_salary = gross_salary
-else:
-  ceiling_salary = 2432
-
-# "Char" slice type
-if gross_salary <= 2432:
-  char_slice = 'A'
-elif gross_salary <= 9728:
-  char_slice = 'B'
-elif gross_salary <= 19456:
-  char_slice = 'C'
-else:
-  char_slice = ''
-
-# "Number" slice type
-if gross_salary <= 2432:
-  num_slice = 1
-elif gross_salary <= 7296:
-  num_slice = 2
-else:
-  num_slice = 0
-
-# age-slice of the company
-old_limit = DateTime(1997, 1, 1)
-if company_birth < old_limit:
-  comp_type = 'old'
-else:
-  comp_type = 'new'
-
-
-
-### create a new pay sheet line
-def createPaySheetLine(new_id='', new_title='', share='',
-                       src_sec='', src='', src_deb=None,
-                       dest_sec='', dest='', new_desc=''):
-
-  suffix = {'cs': '',
-            'pp': ' (part patronale)'}
-  if share == 'pp' or share == 'cs':
-    new_id = string.replace(string.lower(new_title), ' ', '_')
-    new_id += '_' + share
-    #new_title = string.replace(new_title, '?', 'e')
-    #new_title = string.replace(new_title, '?', 'e')
-    #new_title = string.replace(new_title, '?', 'o')
-    new_title += suffix[share]
-    if share == 'cs':
-      src_sec  = employer
-      src      = dette_sociale
-      dest     = creance_sociale
-    elif share == 'pp':
-      src_sec  = employer
-      src      = charge_sociale
-      dest     = produit_social
-  #if wrong ID (existing or wrong name): new_id = str(pay_sheet.generateNewId())
-  context.portal_types.constructContent(type_name = pay_sheet_line_type,
-                                        container = pay_sheet,
-                                        id        = new_id)
-  pay_sheet[new_id].setTitle(new_title)
-  pay_sheet[new_id].setResource(pay_sheet_resource)  # default currency
-  pay_sheet[new_id].setSourceSection(src_sec)
-  pay_sheet[new_id].setSource(src)
-  pay_sheet[new_id].setDestinationSection(dest_sec)
-  pay_sheet[new_id].setDestination(dest)
-  pay_sheet[new_id].setSourceDebit(src_deb)
-  pay_sheet[new_id].setSourceDebit(src_deb)
-  pay_sheet[new_id].setDescription(new_desc)
-
-
-
-### add a pay sheet item and manage the accounting writing rules
-def addPaySheetItem(title='', values={'salary_share_rate':None, 'employer_share_rate':None, 'base_value':None, 'base_description':None}, dest_org=''):
-    global salary_share_total
-    salary_share_value = None
-    employer_share_value = None
-    ps_description = None
-    pp_description = None
-    if values['salary_share_rate']!=None and values['base_value']!=None:
-        salary_share_value = (float(values['salary_share_rate']) / 100) * values['base_value']
-        ps_description = "= " + str(values['salary_share_rate']) + "% * " + str(values['base_value']) + " (=" + str(values['base_description']) + ")"
-    if values['employer_share_rate']!=None and values['base_value']!=None:
-        employer_share_value = (float(values['employer_share_rate']) / 100) * values['base_value']
-        pp_description = "= " + str(values['employer_share_rate']) + "% * " + str(values['base_value']) + " (=" + str(values['base_description']) + ")"
-    if salary_share_value == None and employer_share_value == None:
-        return
-    if salary_share_value != None:
-        salary_share_total += float(salary_share_value)
-    if employer_share_value == None:
-        createPaySheetLine( new_title = title,
-                            share     = 'cs',
-                            src_deb   = salary_share_value,
-                            dest_sec  = dest_org,
-                            new_desc  = ps_description)
-        return
-    if salary_share_value == None:
-        createPaySheetLine( new_title = title,
-                            share     = 'cs',
-                            src_deb   = employer_share_value,
-                            dest_sec  = dest_org,
-                            new_desc  = ps_description)
-        createPaySheetLine( new_title = title,
-                            share     = 'pp',
-                            src_deb   = employer_share_value,
-                            dest_sec  = dest_org,
-                            new_desc  = pp_description)
-        return
-    createPaySheetLine( new_title = title,
-                        share     = 'cs',
-                        src_deb   = float(employer_share_value) + float(salary_share_value),
-                        dest_sec  = dest_org,
-                        new_desc  = ps_description)
-    createPaySheetLine( new_title = title,
-                        share     = 'pp',
-                        src_deb   = employer_share_value,
-                        dest_sec  = dest_org,
-                        new_desc  = pp_description)
-
-
-
-### add the gross salary Pay Sheet Line
-createPaySheetLine( new_id      = 'gs',
-                    new_title   = 'Salaire brut',
-                    src_sec     = employer,
-                    src         = charge_salariale,
-                    src_deb     = gross_salary,
-                    dest_sec    = employee,
-                    dest        = produit_salarial)
-
-
-
-### Social Security
-# sickness insurance
-sickness_insurance =    { 'salary_share_rate'   : None
-                        , 'employer_share_rate' : 12.80
-                        , 'base_value'          : gross_salary
-                        , 'base_description'    : "salaire brut"
-                        }
-if employer_region == '57' or employer_region == '67' or employer_region == '68':
-    sickness_insurance['salary_share_rate'] = 1.70
-else:
-    sickness_insurance['salary_share_rate'] = 0.75
-addPaySheetItem(title       = 'Assurance maladie',
-                values      = sickness_insurance,
-                dest_org    = org_urssaf)
-
-# old-age insurance
-# this contribution is special because salary and employer shares are calculated from 2 base
-# salary_share_value = (6.55 / 100) * ceiling_salary
-# salary_share_total += float(salary_share_value)
-# ps_description = "= 6.55% * " + str(ceiling_salary) + " (=salaire plafonné)"
-# employer_share_value = gross_salary * (1.60 / 100) + ceiling_salary * (8.20 / 100)
-# pp_description = "= 1.60% * " + str(gross_salary) + " + 8.20% * " + str(ceiling_salary) + " = 1.60% * salaire brut + 8.20% * salaire plafonné"
-# createPaySheetLine( new_title = 'Assurance vieillesse',
-#                     share     = 'cs',
-#                     src_deb   = float(employer_share_value) + float(salary_share_value),
-#                     dest_sec  = org_urssaf,
-#                     new_desc  = ps_description)
-# createPaySheetLine( new_title = 'Assurance vieillesse',
-#                     share     = 'pp',
-#                     src_deb   = employer_share_value,
-#                     dest_sec  = org_urssaf,
-#                     new_desc  = pp_description)
-oldage_insurance1 = { 'salary_share_rate'   : None
-                    , 'employer_share_rate' : 1.60
-                    , 'base_value'          : gross_salary
-                    , 'base_description'    : "salaire brut"
-                    }
-addPaySheetItem(title    = 'Assurance vieillesse 1',
-                values   = oldage_insurance1,
-                dest_org = org_urssaf)
-oldage_insurance2 = { 'salary_share_rate'   : 6.55
-                    , 'employer_share_rate' : 8.20
-                    , 'base_value'          : ceiling_salary
-                    , 'base_description'    : "salaire plafonné"
-                    }
-addPaySheetItem(title    = 'Assurance vieillesse 2',
-                values   = oldage_insurance2,
-                dest_org = org_urssaf)
-# widowhood insurance
-widowhood_insurance =   { 'salary_share_rate'   : 0.10
-                        , 'employer_share_rate' : None
-                        , 'base_value'          : gross_salary
-                        , 'base_description'    : "salaire brut"
-                        }
-addPaySheetItem(title    = 'Assurance veuvage',
-                values   = widowhood_insurance,
-                dest_org = org_urssaf)
-# family benefits
-family_benefits =   { 'salary_share_rate'   : None
-                    , 'employer_share_rate' : 5.40
-                    , 'base_value'          : gross_salary
-                    , 'base_description'    : "salaire brut"
-                    }
-addPaySheetItem(title       = 'Allocations familiales',
-                values      = family_benefits,
-                dest_org    = org_urssaf)
-# industrial accident
-industrial_accident =   { 'salary_share_rate'   : None
-                        , 'employer_share_rate' : 1.10  # rate depending of company size, department & trade; 1.0 as standard rate, 1.1 for IT
-                        , 'base_value'          : gross_salary
-                        , 'base_description'    : "salaire brut"
-                        }
-addPaySheetItem(title    = 'Accidents du travail',
-                values   = industrial_accident,
-                dest_org = org_urssaf)
-# lodging helps
-lodging_helps = { 'salary_share_rate'   : None
-                , 'employer_share_rate' : None
-                , 'base_value'          : None
-                , 'base_description'    : None
-                }
-if company_size > 9:
-    lodging_helps['employer_share_rate'] = 0.40
-    lodging_helps['base_description'] = "salaire brut"
-    lodging_helps['base_value'] = gross_salary
-else:
-    lodging_helps['employer_share_rate'] = 0.10
-    lodging_helps['base_description'] = "salaire plafonné"
-    lodging_helps['base_value'] = ceiling_salary
-addPaySheetItem(title    = 'Aide au logement',
-                values   = lodging_helps,
-                dest_org = org_urssaf)
-# transport payment
-if company_size > 9:
-    transport_payment = { 'salary_share_rate'   : None
-                        , 'employer_share_rate' : 1.80     # rate depending of the town
-                        , 'base_value'          : gross_salary
-                        , 'base_description'    : "salaire brut"
-                        }
-    addPaySheetItem(title       = 'Versement au transport',
-                    values      = transport_payment,
-                    dest_org    = org_urssaf)
-
-
-
-### CSG = Contribution Sociale Generalisee (deductible / non deductible)
-CSGd =  { 'salary_share_rate'   : 2.4
-        , 'employer_share_rate' : None
-        , 'base_value'          : 0.95 * gross_salary
-        , 'base_description'    : "95% du salaire brut"
-        }
-addPaySheetItem(title    = 'CSG deductible',
-                values   = CSGd,
-                dest_org = org_urssaf)
-CSGnd = { 'salary_share_rate'   : 5.1
-        , 'employer_share_rate' : None
-        , 'base_value'          : 0.95 * gross_salary
-        , 'base_description'    : "95% du salaire brut"
-        }
-addPaySheetItem(title    = 'CSG non deductible',
-                values   = CSGnd,
-                dest_org = org_urssaf)
-
-
-
-### CRDS = Contribution pour le Remboursement de la Dette Sociale
-CRDS =  { 'salary_share_rate'   : 0.5
-        , 'employer_share_rate' : None
-        , 'base_value'          : 0.95 * gross_salary
-        , 'base_description'    : "95% du salaire brut"
-        }
-addPaySheetItem(title    = 'CRDS',
-                values   = CRDS,
-                dest_org = org_urssaf)
-
-
-
-### Unemployment Insurance
-if char_slice == 'A' or char_slice == 'B':
-    unemployment_insurance =    { 'salary_share_rate'   : 2.4
-                                , 'employer_share_rate' : 4.0
-                                , 'base_value'          : gross_salary
-                                , 'base_description'    : "salaire brut"
-                                }
-    addPaySheetItem(title    = 'Assurance chomage',
-                    values   = unemployment_insurance,
-                    dest_org = org_assedic)
-
-
-
-### AGS (FNGS)
-if char_slice == 'A' or char_slice == 'B':
-    AGS =   { 'salary_share_rate'   : None
-            , 'employer_share_rate' : 0.35
-            , 'base_value'          : gross_salary
-            , 'base_description'    : "salaire brut"
-            }
-    addPaySheetItem(title    = 'AGS',
-                    values   = AGS,
-                    dest_org = org_assedic)
-
-
-
-### supplementary pension
-# ARRCO
-ARRCO = { 'salary_share_rate'   : None
-        , 'employer_share_rate' : None
-        , 'base_value'          : gross_salary
-        , 'base_description'    : "salaire brut"
-        }
-if executive == False:
-    if num_slice == 1:
-        ARRCO['salary_share_rate']   = 3.0
-        ARRCO['employer_share_rate'] = 4.5
-    elif num_slice == 2:
-        if comp_type == 'old':
-            ARRCO['salary_share_rate']   = 6.0
-            ARRCO['employer_share_rate'] = 9.0
-        else:
-            ARRCO['salary_share_rate']   = 8.0
-            ARRCO['employer_share_rate'] = 12.0
-elif char_slice == 'A':
-    ARRCO['salary_share_rate']   = 3.0
-    ARRCO['employer_share_rate'] = 4.5
-addPaySheetItem(title    = 'ARRCO',
-                values   = ARRCO,
-                dest_org = org_arrco)
-# AGFF
-AGFF =  { 'salary_share_rate'   : None
-        , 'employer_share_rate' : None
-        , 'base_value'          : gross_salary
-        , 'base_description'    : "salaire brut"
-        }
-if ((executive == False and num_slice == 1) or
-    (executive == True and char_slice == 'A')):
-    AGFF['salary_share_rate']   = 0.80
-    AGFF['employer_share_rate'] = 1.20
-elif ((executive == False and num_slice == 2) or
-      (executive == True and char_slice == 'B')):
-    AGFF['salary_share_rate']   = 0.90
-    AGFF['employer_share_rate'] = 1.30
-addPaySheetItem(title    = 'AGFF',
-                values   = AGFF,
-                dest_org = org_agff)
-# AGIRC
-if executive == True:
-    AGIRC = { 'salary_share_rate'   : None
-            , 'employer_share_rate' : None
-            , 'base_value'          : gross_salary
-            , 'base_description'    : "salaire brut"
-            }
-    if char_slice == 'B':
-        AGIRC['salary_share_rate']   = 7.50
-        AGIRC['employer_share_rate'] = 12.50
-    elif char_slice == 'C':
-        # free repartition (20% to share between employee & employer)
-        AGIRC['salary_share_rate']   = 10.0
-        AGIRC['employer_share_rate'] = 10.0
-    addPaySheetItem(title    = 'AGIRC',
-                    values   = AGIRC,
-                    dest_org = org_agirc)
-# CET
-if executive == True and (char_slice == 'A' or char_slice == 'B' or char_slice == 'C'):
-    CET =   { 'salary_share_rate'   : 0.13
-            , 'employer_share_rate' : 0.22
-            , 'base_value'          : gross_salary
-            , 'base_description'    : "salaire brut"
-            }
-    addPaySheetItem(title    = 'CET',
-                    values   = CET,
-                    dest_org = org_agirc)
-
-
-
-### life insurance
-if executive == True and char_slice == 'A':
-    life_insurance =    { 'salary_share_rate'   : None
-                        , 'employer_share_rate' : 1.5
-                        , 'base_value'          : gross_salary
-                        , 'base_description'    : "salaire brut"
-                        }
-    addPaySheetItem(title    = 'Assurance deces',
-                    values   = life_insurance,
-                    dest_org = org_urssaf)
-
-
-
-### APEC
-if char_slice == 'B':
-    APEC =  { 'salary_share_rate'   : 0.024
-            , 'employer_share_rate' : 0.036
-            , 'base_value'          : gross_salary
-            , 'base_description'    : "salaire brut"
-            }
-    #!!! verifier l'application de cette histoire de forfait...
-    #if executive == True and DateTime.Date.Today().month == 3:
-    #  apec['s'] = apec['s'] + 7.0
-    #  apec['e'] = apec['e'] + 10.51
-    addPaySheetItem(title    = 'APEC',
-                    values   = APEC,
-                    dest_org = org_apec)
-
-
-
-### Taxes
-# construction tax
-if company_size > 9:
-    construction_tax =  { 'salary_share_rate'   : None
-                        , 'employer_share_rate' : 0.45
-                        , 'base_value'          : gross_salary
-                        , 'base_description'    : "salaire brut"
-                        }
-    addPaySheetItem(title    = 'Construction',
-                    values   = construction_tax,
-                    dest_org = org_etat)
-# training tax
-training_tax =  { 'salary_share_rate'   : None
-                , 'employer_share_rate' : 0.50
-                , 'base_value'          : gross_salary
-                , 'base_description'    : "salaire brut"
-                }
-addPaySheetItem(title    = 'Apprentissage',
-                values   = training_tax,
-                dest_org = org_etat)
-# courses tax
-courses_tax =   { 'salary_share_rate'   : None
-                , 'employer_share_rate' : None
-                , 'base_value'          : gross_salary
-                , 'base_description'    : "salaire brut"
-                }
-if company_size < 10:
-    courses_tax['employer_share_rate'] = 0.15
-else:
-    courses_tax['employer_share_rate'] = 1.5
-addPaySheetItem(title    = 'Formation professionnelle',
-                values   = courses_tax,
-                dest_org = org_etat)
-
-
-
-### Take Home salary
-final_salary = gross_salary - salary_share_total
-createPaySheetLine(new_id    = 'final_salary',
-                   new_title = 'Salaire Net',
-                   src_sec   = employer,
-                   src       = dette_salarie,
-                   src_deb   = final_salary,
-                   dest_sec  = employee,
-                   dest      = creance_salarie)
diff --git a/product/ERP5/skins/erp5_accounting/PaySheet_viewAsPDF.pt b/product/ERP5/skins/erp5_accounting/PaySheet_viewAsPDF.pt
deleted file mode 100755
index 34fed2d3f6ec77178cbda9645eee4e313307ef99..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaySheet_viewAsPDF.pt
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-    <head>
-        <meta http-equiv="content-type" content="text/html;charset=ISO-8859-1">
-        <title>Pay Sheet</title>
-        <style type="text/css">
-        @import "pay_sheet_css.css";
-        </style>
-    </head>
-
-    <body tal:define="employee python: here.restrictedTraverse(here.getDestinationSectionRelativeUrl());
-                    employer python: here.restrictedTraverse(here.getSourceSectionRelativeUrl())">
-
-    <div class="spacer">&nbsp;</div>
-
-    <div class="logo">
-        <img src="logo.png">
-    </div>
-
-    <div class="title">
-        <h1>FEUILLE DE SALAIRE</h1>
-        <h2 tal:content="python: '- n°%s -' % here.getId()"/>
-    </div>
-
-    <div class="spacer">&nbsp;</div>
-
-    <div class="employer">
-        <span class="name" tal:content="python: employer.getCorporateName()"/><br/>
-        <span tal:content="python: '%s %s %s' % (
-                                    employer.getDefaultAddress().getStreetAddress(),
-                                    employer.getDefaultAddress().getZipCode(),
-                                    employer.getDefaultAddress().getCity())"/><br/>
-        <span tal:content="python: 'Tel: %s' % employer.getDefaultTelephone().asText()"/><br/><!--optional-->
-        <span tal:content="python: 'Fax: %s' % employer.getDefaultFax().asText()"/><br/><!--optional-->
-        <span tal:content="python: 'E-mail: %s' % employer.getDefaultEmail().asText()"/><br/><!--optional-->
-        <span tal:content="python: 'N°Siret: '"/><br/><!-- from organisation details -->
-        <span tal:content="python: 'N°APE: '"/><br/><!-- from organisation details -->
-        <span tal:content="python: 'N°URSSAF: '"/><br/><!-- from organisation details -->
-        <span tal:content="python: 'Adresse URSSAF: '"/><br/><!-- from organisation details -->
-    </div>
-
-    <div class="employee">
-        <span class="name" tal:content="python: employee.getTitle()"/><br/>
-        <span>Emploi: Directeur Recherche et Développement</span><br/><!-- from career -->
-        <span tal:content="python: 'Matricule: %s' % employee.getId()"/><br/><!--optional-->
-        <span>Qualification: Ingénieur</span><br/><!-- from career -->
-        <span>Echelon: 1</span><br/><!-- from career -->
-        <span>Coefficient: 1.0</span><br/><!-- from career -->
-        <span tal:content="python: '%s %s %s' % (
-                                    employee.getDefaultAddress().getStreetAddress(),
-                                    employee.getDefaultAddress().getZipCode(),
-                                    employee.getDefaultAddress().getCity())"/><br/><!--optional-->
-        <span tal:content="python: 'Tel: %s' % employee.getDefaultTelephone().asText()"/><br/><!--optional-->
-        <span tal:content="python: 'Fax: %s' % employee.getDefaultFax().asText()"/><br/><!--optional-->
-        <span tal:content="python: 'E-mail: %s' % employee.getDefaultEmail().asText()"/><br/><!--optional-->
-        <span tal:content="python: 'N°Secu: '"/><br/><!--optional-->
-    </div>
-
-    <div class="spacer">&nbsp;</div>
-
-    <div class="contract_rules">
-        <span tal:content="python: 'Convention collective de banche:'"/><br/>
-        <span tal:content="python: 'Durée des congés de payés:'"/><br/>
-        <span tal:content="python: 'Durée des délais de préavis:'"/><br/>
-    </div>
-
-    <div class="payment">
-        <span tal:content="python: 'Periode: du %s au %s' % (
-                                    here.getStartDate(),
-                                    here.getStopDate())"/><br/>
-        <span tal:content="python: 'Date de paiement: %s' % here.getTargetStopDate()"/><br/>
-        <span>Type de paiement: Virement</span><br/><!-- from salary information in person --><!--optional-->
-    </div>
-
-    <div class="disclaimer">
-        Dans votre intérêt et pour vous aider à faire valoir vos droits, conservez ce bulletin de paie sans limitation de durée.
-    </div>
-
-    <br>
-
-    <table width="100%">
-      <tr bgcolor=000000>
-        <th><font color=ffffff>Nature</font></th>
-        <th><font color=ffffff>Part patronale</font></th>
-        <th><font color=ffffff>Calcul PP</font></th>
-        <th><font color=ffffff>Part salariale</font></th>
-        <th><font color=ffffff>Calcul PS</font></th>
-      </tr>
-      <tr>
-        <td tal:content="python: here.gs.getTitle()"/>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td tal:content="python: '%.2f' % here.gs.getDestinationCredit()"/>
-        <td>&nbsp;</td>
-      </tr>
-      <tr tal:define="pay_sheet_lines python: here.PaySheetTransaction_getLineListPrintFormat()"
-          tal:repeat="line pay_sheet_lines">
-        <td class="line"><span tal:content="python: line['title']"/></td>
-        <td class="line"><span tal:content="python: line['pp']"/></td>
-        <td class="line"><span tal:content="python: line['pp_desc']"/></td>
-        <td class="line"><span tal:content="python: line['ps']"/></td>
-        <td class="line"><span tal:content="python: line['ps_desc']"/></td>
-      </tr>
-      <tr >
-        <td><b tal:content="python: here.final_salary.getTitle()"/> (EUR)</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td><b tal:content="python: '%.2f' % here.final_salary.getDestinationCredit()"/></td>
-        <td>&nbsp;</td>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_accounting/PaymentTransaction_view.form b/product/ERP5/skins/erp5_accounting/PaymentTransaction_view.form
deleted file mode 100755
index 9a0f232dfef837d9c62e11d56c8ed2c584074c86..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaymentTransaction_view.form
+++ /dev/null
@@ -1,610 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Payment Transaction</title>
-  <row_length>4</row_length>
-  <name>PaymentTransaction_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_source_section</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Section</title>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: [['Nexedi', 'organisation/nexedi'], ]</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_payment</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Section Account</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: here.AccountingTransaction_getSourcePaymentItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Third Party</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_payment</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Third Party Account</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: here.AccountingTransaction_getDestinationPaymentItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission></editable_permission>
-          <editable_role></editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Invoice Number</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission></viewable_permission>
-          <viewable_role></viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[('','')]+map(lambda x:(x.id,'currency/%s' %x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Operation Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>simulation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">1</read_only>
-          <required type="int">0</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'simulation_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Third Party Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('source', 'Account'), ('source_debit', 'Debit'), ('source_credit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('source_debit', 'Debit'), ('source_credit', 'Credit'), ('source', 'Account')]</editable_columns>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[('resource', 'resource')]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">AccountingTransaction_searchInvoiceTransactionLines</list_method>
-          <meta_types type="list">[]</meta_types>
-          <not_viewable type="int">0</not_viewable>
-          <portal_types type="list">[]</portal_types>
-          <read_only type="int">0</read_only>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>payment_transaction_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Payment Transaction Lines</title>
-          <url_columns></url_columns>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_credit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PaymentTransaction_viewDetails.form b/product/ERP5/skins/erp5_accounting/PaymentTransaction_viewDetails.form
deleted file mode 100755
index 56753efcdb4b91418722d9eb31b39e48173ca7c1..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PaymentTransaction_viewDetails.form
+++ /dev/null
@@ -1,573 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Payment Transaction</title>
-  <row_length>4</row_length>
-  <name>PaymentTransaction_viewDetails</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_source_section</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Section</title>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: [['Nexedi', 'organisation/nexedi']]</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Third Party</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission></editable_permission>
-          <editable_role></editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Invoice Number</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission></viewable_permission>
-          <viewable_role></viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[('','')]+map(lambda x:(x.id,'currency/%s' %x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Start Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Stop Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>simulation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">1</read_only>
-          <required type="int">0</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'simulation_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Third Party Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('source', 'Section Account'), ('source_debit', 'Debit'), ('source_credit', 'Credit'), ('destination', 'Third Party Account'), ('destination_debit', 'Debit'), ('destination_credit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('source_debit', 'Debit'), ('source_credit', 'Credit'), ('destination', 'Destination'), ('source', 'Source')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[('resource', 'resource')]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">AccountingTransaction_searchInvoiceTransactionLines</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>payment_transaction_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Payment Transaction Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PurchaseInvoiceTransactionLine_view.form b/product/ERP5/skins/erp5_accounting/PurchaseInvoiceTransactionLine_view.form
deleted file mode 100755
index 0fde66328c82ef0392754a2ddfa74ea0018fc3e1..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PurchaseInvoiceTransactionLine_view.form
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Invoice Transaction Line</title>
-  <row_length>4</row_length>
-  <name>purchase_invoice_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Customer Account</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:here.InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Vendor Account</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:here.InvoiceTransactionLine_getDestinationItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Source Credit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Source Debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PurchaseInvoiceTransaction_view.form b/product/ERP5/skins/erp5_accounting/PurchaseInvoiceTransaction_view.form
deleted file mode 100755
index bd90a73d3eddfb83520751348b101fb292494c42..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PurchaseInvoiceTransaction_view.form
+++ /dev/null
@@ -1,552 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Invoice Transaction</title>
-  <row_length>4</row_length>
-  <name>purchase_invoice_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_source_section</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Customer</title>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: [['Nexedi', 'organisation/nexedi'], ]</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Vendor</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission></editable_permission>
-          <editable_role></editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Invoice Number</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission></viewable_permission>
-          <viewable_role></viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[('','')]+map(lambda x:(x.id,'currency/%s' %x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Operation Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>simulation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">1</read_only>
-          <required type="int">0</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'simulation_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Vendor Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('source', 'Account'), ('source_debit', 'Debit'), ('source_credit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('source_debit', 'Debit'), ('source_credit', 'Credit'), ('source', 'Account')]</editable_columns>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[('resource', 'resource')]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">AccountingTransaction_searchInvoiceTransactionLines</list_method>
-          <meta_types type="list">[]</meta_types>
-          <not_viewable type="int">0</not_viewable>
-          <portal_types type="list">[]</portal_types>
-          <read_only type="int">0</read_only>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>purchase_invoice_transaction_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Purchase Invoice Transaction Lines</title>
-          <url_columns></url_columns>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_credit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails.form b/product/ERP5/skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails.form
deleted file mode 100755
index 443b15ed6887402e50133a7ff3e8b662007aca3e..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/PurchaseInvoiceTransaction_viewDetails.form
+++ /dev/null
@@ -1,573 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Invoice Transaction</title>
-  <row_length>4</row_length>
-  <name>purchase_invoice_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_source_section</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Customer</title>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: [['Nexedi', 'organisation/nexedi']]</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Vendor</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission></editable_permission>
-          <editable_role></editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <title>Invoice Number</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission></viewable_permission>
-          <viewable_role></viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[('','')]+map(lambda x:(x.id,'currency/%s' %x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Start Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Stop Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>simulation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">1</read_only>
-          <required type="int">0</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'simulation_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Vendor Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('source', 'Customer Account'), ('source_debit', 'Debit'), ('source_credit', 'Credit'), ('destination', 'Vendor Account'), ('destination_debit', 'Debit'), ('destination_credit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('source_debit', 'Debit'), ('source_credit', 'Credit'), ('destination', 'Destination'), ('source', 'Source')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[('resource', 'resource')]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">AccountingTransaction_searchInvoiceTransactionLines</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>purchase_invoice_transaction_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Purchase Invoice Transaction Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Resource_zGetInventory.zsql b/product/ERP5/skins/erp5_accounting/Resource_zGetInventory.zsql
deleted file mode 100755
index 66200e32451f753f669c9df6cf071ca716c80edc..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Resource_zGetInventory.zsql
+++ /dev/null
@@ -1,76 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:InventoryBrain
-class_file:InventoryBrain.py
-</dtml-comment>
-<params>resource_uid:list
-resource:list
-from_date
-to_date
-node
-section
-node_uid
-section_uid
-variation_text=None
-node_category
-section_category
-resource_category
-omit_simulation
-omit_input
-omit_output
-simulation_state
-query</params>
-SELECT
-	SUM(stock.quantity) AS inventory,
-	SUM(stock.quantity) AS quantity,
-	COUNT(DISTINCT node.title) AS node_title,
-	COUNT(DISTINCT node.relative_url) AS node_relative_url,
-	COUNT(DISTINCT section.title) AS section_title,
-	COUNT(DISTINCT section.relative_url) AS section_relative_url,
-	COUNT(DISTINCT resource.title) AS resource_title,
-	COUNT(DISTINCT resource.relative_url) AS resource_relative_url,
-	COUNT(DISTINCT movement.variation_text) AS variation_text,
-	MAX(stock.resource_uid) AS resource_uid,
-	COUNT(DISTINCT stock.uid) AS stock_uid
-FROM
-        movement
-        LEFT JOIN catalog ON (movement.uid = catalog.uid)
-        LEFT JOIN stock ON (movement.uid = stock.uid)
-	, catalog AS node, catalog AS section, catalog AS resource <dtml-if node_category>, catalog AS node_c, catalog AS node_bc, category AS node_membership </dtml-if> <dtml-if section_category>, catalog AS section_c, catalog AS section_bc, category AS section_membership</dtml-if> <dtml-if resource_category>, catalog AS resource_c, catalog AS resource_bc, category AS resource_membership </dtml-if>  <dtml-if query>, category </dtml-if>
-WHERE
-	1 = 1
-<dtml-if resource>AND	(<dtml-in resource> resource.relative_url = <dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else> OR </dtml-if></dtml-in>)
-</dtml-if><dtml-if resource_uid>AND	(<dtml-in resource_uid> movement.resource_uid = <dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if></dtml-in>)
-</dtml-if><dtml-if "variation_text not in (None, 'None')">AND	movement.variation_text = <dtml-sqlvar variation_text type="string">
-</dtml-if>AND	movement.is_accountable = 1
-AND	node.uid = stock.node_uid
-AND	section.uid = stock.section_uid
-AND	stock.resource_uid = resource.uid
-<dtml-if from_date>AND	movement.stop_date >= <dtml-sqlvar from_date type="string">
-</dtml-if><dtml-if to_date>AND	movement.stop_date < <dtml-sqlvar to_date type="string">
-</dtml-if><dtml-if node_uid>AND	stock.node_uid  = <dtml-sqlvar node_uid type="int">
-</dtml-if><dtml-if section_uid>AND	stock.section_uid  = <dtml-sqlvar section_uid type="int">
-</dtml-if><dtml-if node>AND	node.relative_url = <dtml-sqlvar node type="string">
-</dtml-if><dtml-if section>AND	section.relative_url = <dtml-sqlvar section type="string">
-</dtml-if><dtml-if node_category>AND	node_c.relative_url = <dtml-sqlvar node_category type="string">
-AND	node_membership.category_uid = node_c.uid
-AND	node_membership.base_category_uid = node_bc.uid
-AND	node_membership.uid = node.uid
-</dtml-if><dtml-if section_category>AND	section_c.relative_url = <dtml-sqlvar section_category type="string">
-AND	section_membership.category_uid =  section_c.uid
-AND	section_membership.base_category_uid = section_bc.uid
-AND	section_membership.uid = section.uid
-</dtml-if><dtml-if resource_category>AND	resource_c.relative_url = <dtml-sqlvar resource_category type="string">
-AND	resource_membership.category_uid =  resource_c.uid
-AND	resource_membership.base_category_uid = resource_bc.uid
-AND	resource_membership.uid = resource.uid
-</dtml-if><dtml-if omit_simulation>AND	catalog.portal_type != "Simulation Movement"
-</dtml-if><dtml-if omit_input>AND	stock.quantity < 0 AND movement.source_uid <> movement.destination_uid 
-</dtml-if><dtml-if omit_output>AND	stock.quantity > 0 AND movement.source_uid <> movement.destination_uid 
-</dtml-if><dtml-if simulation_state>AND	(<dtml-in simulation_state> catalog.simulation_state = <dtml-sqlvar sequence-item type="string"><dtml-if sequence-end><dtml-else> OR </dtml-if></dtml-in>)
-</dtml-if><dtml-if query>AND	category.uid = node.uid
-AND	<dtml-var query></dtml-if>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/SaleInvoiceTransactionLine_view.form b/product/ERP5/skins/erp5_accounting/SaleInvoiceTransactionLine_view.form
deleted file mode 100755
index 868c8145ddb80352a445c8e19d2f16f42846795b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/SaleInvoiceTransactionLine_view.form
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Invoice Transaction Line</title>
-  <row_length>4</row_length>
-  <name>sale_invoice_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Vendor Account</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:here.InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Customer Account</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:here.InvoiceTransactionLine_getDestinationItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Vendor Debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Vendor Credit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/SaleInvoiceTransaction_view.form b/product/ERP5/skins/erp5_accounting/SaleInvoiceTransaction_view.form
deleted file mode 100755
index ebf0bc0720f736aa92467f5a4bffe5364a8a10de..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/SaleInvoiceTransaction_view.form
+++ /dev/null
@@ -1,675 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Invoice Transaction</title>
-  <row_length>4</row_length>
-  <name>sale_invoice_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_source_section</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Vendor</title>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: [['Nexedi', 'organisation/nexedi']]</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">0</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">1</read_only>
-          <required type="int">0</required>
-          <title>Invoice Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_source_administration_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_administration</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>person</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Sale Manager</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Invoice Date</title>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>simulation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">1</read_only>
-          <required type="int">0</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'simulation_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[('','')]+map(lambda x:(x.id,'currency/%s' %x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_causality_id</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>causality</base_category>
-          <catalog_index>id</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>sale_packing_list</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <portal_type type="list">[('Sale Packing List', 'Sale Packing List')]</portal_type>
-          <read_only type="int">0</read_only>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Packing List No</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Deliver to</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <read_only type="int">0</read_only>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>For the account of</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_value_added_tax_recoverable</id> <type>CheckBoxField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="int">0</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <title>VAT in use</title>
-        </values>
-        <tales>
-          <default>here/getValueAddedTaxRecoverable</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      <field><id>my_value_added_tax_ratio</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>VAT ratio</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_incoterm</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Incoterm</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_delivery_mode</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Delivery Mode</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/delivery_mode/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>total_without_tax</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Total without tax included</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python: '%.2f' % here.getTotalPrice()</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>total_taxable</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Total Taxable</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python: '%.2f' % here.Invoice_zGetTotalNetPrice()</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>vat</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>VAT</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python: '%.2f' % here.Invoice_zGetTotalVat()</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>total_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Net Price to pay</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:'%.2f' % (here.Invoice_zGetTotalVat() + here.Invoice_zGetTotalNetPrice())</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>due_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>dmy</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Due Date</title>
-        </values>
-        <tales>
-          <default>python:here.SaleInvoiceTransaction_getDueDate()</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/SaleInvoiceTransaction_viewDetails.form b/product/ERP5/skins/erp5_accounting/SaleInvoiceTransaction_viewDetails.form
deleted file mode 100755
index 8e712de2567d52ce065d39d9d83d59e2c903aa27..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/SaleInvoiceTransaction_viewDetails.form
+++ /dev/null
@@ -1,478 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Invoice Transaction</title>
-  <row_length>4</row_length>
-  <name>SaleInvoiceTransaction_viewDetails</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Client</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Vendor</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/l0/getDefaultResource | nothing</default>
-          <items>python:map(lambda x: (x.id,'currency/%s' % x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_causality_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>causality</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>sale_packing_list</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Sale Packing List', 'Sale Packing List')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Packing List</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Start Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Stop Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('title', 'Title'), ('source', 'Source'), ('source_debit', 'Debit'), ('source_credit', 'Credit'), ('destination', 'Destination'), ('destination_debit', 'Debit'), ('destination_credit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('title', 'Title'), ('source_debit', 'Debit'), ('source_credit', 'Credit'), ('destination', 'Destination'), ('source', 'Source')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[('resource', 'resource')]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Sale Invoice Transaction Line', 'Sale Invoice Transaction Line'), ('Accounting Transaction Line', 'Accounting Transaction Line')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>purchase_invoice_transaction_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Sale Invoice Transaction Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Sql_zStockAccountDate.zsql b/product/ERP5/skins/erp5_accounting/Sql_zStockAccountDate.zsql
deleted file mode 100755
index 510cf59fdddc0e7f05e8594393767858a87fd1ff..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Sql_zStockAccountDate.zsql
+++ /dev/null
@@ -1,26 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:ZSQLBrain
-class_file:zsqlbrain.py
-</dtml-comment>
-<params>query</params>
-<dtml-if query>
-SELECT DISTINCT catalog.*, stock.quantity, movement.start_date, movement.stop_date, resource.title
-FROM catalog,  stock, category, catalog as resource, movement
-WHERE catalog.uid = stock.uid 
-  AND movement.resource_uid=resource.uid
-  AND movement.uid = catalog.uid
-  AND category.uid = stock.node_uid
-  AND (<dtml-var query>)
-<dtml-else>
-SELECT DISTINCT catalog.*, stock.quantity, movement.start_date, movement.stop_date, resource.title
-FROM catalog, catalog as node, stock, catalog as resource, movement
-WHERE catalog.uid = stock.uid 
-  AND stock.node_uid = node.uid
-  AND movement.resource_uid=resource.uid
-  AND movement.uid = catalog.uid
-</dtml-if>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Sql_zStockAccountDateStat.zsql b/product/ERP5/skins/erp5_accounting/Sql_zStockAccountDateStat.zsql
deleted file mode 100755
index 0039808cf9478c77596cd76e87175685a8df8c74..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Sql_zStockAccountDateStat.zsql
+++ /dev/null
@@ -1,27 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:ZSQLBrain
-class_file:zsqlbrain.py
-</dtml-comment>
-<params>query
-stat_query</params>
-<dtml-if query>
-SELECT <dtml-var stat_query>
-FROM catalog,  stock, category, catalog as resource, movement
-WHERE catalog.uid = stock.uid 
-  AND movement.resource_uid=resource.uid
-  AND movement.uid = catalog.uid
-  AND category.uid = stock.node_uid
-  AND (<dtml-var query>)
-<dtml-else>
-SELECT <dtml-var stat_query>
-FROM catalog, catalog as node, stock, catalog as resource, movement
-WHERE catalog.uid = stock.uid 
-  AND stock.node_uid = node.uid
-  AND movement.resource_uid=resource.uid
-  AND movement.uid = catalog.uid
-</dtml-if>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Sql_zStockAccountParent.zsql b/product/ERP5/skins/erp5_accounting/Sql_zStockAccountParent.zsql
deleted file mode 100755
index ecc1eb567b8e71aa9646b3906a545a5fec622acb..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Sql_zStockAccountParent.zsql
+++ /dev/null
@@ -1,25 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:ZSQLBrain
-class_file:zsqlbrain.py
-</dtml-comment>
-<params>getUid
-query</params>
-<dtml-if getUid>
-SELECT DISTINCT catalog.*, stock.quantity, parent.Title as parent_title
-FROM catalog, catalog as node, stock, catalog as parent, category
-WHERE catalog.uid = stock.uid 
-  AND stock.node_uid = node.uid
-  AND catalog.parent_uid = parent.uid
-  AND stock.node_uid = <dtml-var getUid>
-  AND stock.quantity != 0.0
-<dtml-if query>
-  AND category.uid = stock.section_uid
-AND <dtml-var query>
-</dtml-if>
-
-</dtml-if>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Sql_zStockCount.zsql b/product/ERP5/skins/erp5_accounting/Sql_zStockCount.zsql
deleted file mode 100755
index 9760f4ed90d8c04885744c1b43463a51ef546502..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Sql_zStockCount.zsql
+++ /dev/null
@@ -1,16 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:
-class_file:
-</dtml-comment>
-<params>query</params>
-SELECT SUM(stock.quantity)
-FROM catalog, catalog as node, stock, category
-WHERE catalog.uid = stock.uid 
-  AND node.uid = category.uid
-  AND stock.node_uid = node.uid
-  AND <dtml-var query>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_accounting/Sql_zStockSearch.zsql b/product/ERP5/skins/erp5_accounting/Sql_zStockSearch.zsql
deleted file mode 100755
index a28063b877ea308ac9eefa216459b370b6e70584..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/Sql_zStockSearch.zsql
+++ /dev/null
@@ -1,17 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:
-class_file:
-</dtml-comment>
-<params>query
-getUid</params>
-SELECT DISTINCT catalog.*, stock.quantity
-FROM catalog, catalog as node, stock, category
-WHERE catalog.uid = stock.uid 
-  AND node.uid = category.uid
-  AND stock.node_uid = node.uid
-  AND <dtml-var query>
diff --git a/product/ERP5/skins/erp5_accounting/copy_of_PaySheetTransaction_pdf_template.pt b/product/ERP5/skins/erp5_accounting/copy_of_PaySheetTransaction_pdf_template.pt
deleted file mode 100755
index 358f09964b6f0540a22a19a44e84cd13a0e01705..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/copy_of_PaySheetTransaction_pdf_template.pt
+++ /dev/null
@@ -1,8 +0,0 @@
-  <template bottommargin='0.665cm' showboundary='0' topmargin='0.635cm' rightmargin='0.665cm' tal:define='portal python:here.portal_url.getPortalObject()' filename='paysheet.pdf' pagesize='A4' allowsplitting='1' landscape='0' leftmargin='0.635cm'>
-    <pagetemplate startframe='content' id='FirstPage'>
-      <static>
-	<infostring x='3cm' y='3cm'>blabla</infostring>        
-      </static>
-      <frame showBoundary='0' leftpadding='0.1cm' height='18.14cm' width='19.701cm' rightpadding='0.1cm' y='2.289cm' x='0.635cm' nextid='content' toppadding='0.2cm' id='content' bottompadding='0.5cm'/>
-    </pagetemplate>
-  </template>
diff --git a/product/ERP5/skins/erp5_accounting/copy_of_Resource_zGetInventory.zsql b/product/ERP5/skins/erp5_accounting/copy_of_Resource_zGetInventory.zsql
deleted file mode 100755
index b8debda7f79de8732f99acb1fd50070f89c69032..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_accounting/copy_of_Resource_zGetInventory.zsql
+++ /dev/null
@@ -1,39 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:InventoryBrain
-class_file:InventoryBrain.py
-</dtml-comment>
-<params>resource_uid:list
-resource:list
-from_date
-to_date
-node
-section
-node_uid
-section_uid
-variation_text=None
-node_category
-section_category
-resource_category
-omit_simulation
-omit_input
-omit_output
-simulation_state
-query</params>
-SELECT
-	SUM(stock.quantity) AS inventory
-FROM
-        movement
-        LEFT JOIN catalog ON (movement.uid = catalog.uid)
-        LEFT JOIN stock ON (movement.uid = stock.uid)
-	, catalog AS node, catalog AS section, catalog AS resource
-WHERE
-	1 = 1
-AND	movement.is_accountable = 1
-AND	node.uid = stock.node_uid
-AND	section.uid = stock.section_uid
-AND	stock.resource_uid = resource.uid
diff --git a/product/ERP5/skins/erp5_core/Base_assignLocalRole.py b/product/ERP5/skins/erp5_core/Base_assignLocalRole.py
deleted file mode 100755
index b50f5c9bdc320565bfbb59260c48eebbaed7d9a7..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_assignLocalRole.py
+++ /dev/null
@@ -1,29 +0,0 @@
-## Script (Python) "Base_assignLocalRole"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# Assign to each user in the user_list all
-# roles inside role_list. By the same time,
-# we ensure that nobody else have one of
-# the role of role_list
-
-for role in role_list:
-  for user in context.users_with_local_role(role):
-    temp_roles = []
-    user_roles = context.get_local_roles_for_userid(user)
-    for i in range(0,len(user_roles)):
-      if user_roles[i]!=role:
-        temp_roles+=[user_roles[i]]
-        #user_roles = user_roles[0:i] + user_roles[i+1:len(user_roles)]
-    if len(temp_roles) is not 0:
-      context.manage_setLocalRoles(user,temp_roles)
-    else:
-      context.manage_delLocalRoles((user,))
-# Add roles to users
-for user in user_list:
-  context.manage_addLocalRoles(user, role_list)
diff --git a/product/ERP5/skins/erp5_core/Base_callDialogMethod.py b/product/ERP5/skins/erp5_core/Base_callDialogMethod.py
deleted file mode 100755
index 989ec132479b91155969cd4d6000a2e410fc4088..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_callDialogMethod.py
+++ /dev/null
@@ -1,100 +0,0 @@
-## Script (Python) "Base_callDialogMethod"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id,cancel_url,dialog_method,selection_name,dialog_id,enable_pickle=0,**kw
-##title=
-##
-# Updates attributes of an Zope document
-# which is in a class inheriting from ERP5 Base
-
-
-from Products.Formulator.Errors import ValidationError, FormValidationError
-from string import join
-from ZTUtils import make_query
-
-request=context.REQUEST
-
-#Exceptions for UI and Sort
-if dialog_method == 'Base_configureUI':
-  return context.Base_configureUI(form_id=form_id,
-                              selection_name=selection_name,
-                              field_columns=getattr(request,'field_columns'),
-                              stat_columns=getattr(request,'stat_columns'))
-if dialog_method == 'Base_configureSortOn':
-  return context.Base_configureSortOn(form_id=form_id,
-                              selection_name=selection_name,
-                              field_sort_on=getattr(request,'field_sort_on'),
-                              field_sort_order=getattr(request,'field_sort_order'))
-
-try:
-  # Validate the form
-  kw = {}
-  if request.has_key('pickle_string'):
-    pickle_string = request.get('pickle_string')
-    kw = context.portal_selections.getObjectFromPickle(pickle_string)
-  #kw = context.portal_selections.getCookieInfo(request,dialog_id)
-  if kw != {}:
-    form = getattr(context.asContext(context=None,portal_type=context.getPortalType(),**kw),dialog_id)
-  else:
-    form = getattr(context,dialog_id)
-  #return context.REQUEST
-  #return kw
-  form.validate_all_to_request(request)
-  kw = {'form_id': form_id, 'selection_name': selection_name , 'selection_index': None} # Missing selection_index
-  has_listbox = 0
-  for f in form.get_fields():
-    k = f.id
-    v = getattr(request,k,None)
-    if v is not None:
-      if k[0:3] == 'my_':
-        k = k[3:]
-        kw[k] = v
-      elif k in ('import_file', 'listbox'):
-        if f.meta_type == 'ListBox': has_listbox = 1
-        kw[k] = v
-  # Add some properties required by UI
-  md5_object_uid_list = getattr(request,'md5_object_uid_list',None)
-  kw['md5_object_uid_list'] = md5_object_uid_list
-  kw['cancel_url'] = cancel_url
-  if has_listbox:
-    listbox_line_list = []
-    listbox = getattr(request,'listbox',None)
-    listbox_keys = listbox.keys()
-    listbox_keys.sort()
-    for key in listbox_keys:
-      listbox_line = listbox[key]
-      listbox_line['listbox_key'] = key
-      listbox_line_list.append(listbox[key])
-    listbox_line_list = tuple(listbox_line_list)
-    kw['listbox'] = listbox_line_list
-  if enable_pickle or (form.update_action!=''):
-    pickle_string = context.portal_selections.getPickle(**kw)
-    request.set('pickle_string', pickle_string)
-  # Redirect if possible, or call directly else
-  if kw.has_key('import_file'):
-    # We can not redirect if we do an import
-    import_file = kw['import_file']
-    return getattr(context,dialog_method)(**kw)
-  if has_listbox:
-    return getattr(context,dialog_method)(**kw)
-  url_params_string = make_query(kw)
-except FormValidationError, validation_errors:
-  # Pack errors into the request
-  field_errors = form.ErrorFields(validation_errors)
-  request.set('field_errors', field_errors)
-  return form(request)
-
-if url_params_string != '':
-  redirect_url = '%s/%s?%s' % ( context.absolute_url()
-                            , dialog_method
-                            , url_params_string
-                            )
-else:
-  redirect_url = '%s/%s' % ( context.absolute_url()
-                            , dialog_method
-                            )
-
-return request.RESPONSE.redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_callListDialogMethod.py b/product/ERP5/skins/erp5_core/Base_callListDialogMethod.py
deleted file mode 100755
index aa96bfc6ee3413f9ab6d2490a4152fbadb7b8932..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_callListDialogMethod.py
+++ /dev/null
@@ -1,90 +0,0 @@
-## Script (Python) "Base_callListDialogMethod"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id,cancel_url,dialog_method,selection_name,dialog_id
-##title=
-##
-# Updates attributes of an Zope document
-# which is in a class inheriting from ERP5 Base
-
-
-from Products.Formulator.Errors import ValidationError, FormValidationError
-from string import join
-
-request=context.REQUEST
-
-#Exceptions for UI and Sort
-if dialog_method == 'Base_configureUI':
-  return context.Base_configureUI(form_id=form_id,
-                              selection_name=selection_name,
-                              field_columns=getattr(request,'field_columns'),
-                              stat_columns=getattr(request,'stat_columns'))
-if dialog_method == 'Base_configureSortOn':
-  return context.Base_configureSortOn(form_id=form_id,
-                              selection_name=selection_name,
-                              field_sort_on=getattr(request,'field_sort_on'),
-                              field_sort_order=getattr(request,'field_sort_order'))
-if dialog_method == 'Base_updateRelation':
-  return context.Base_updateRelation(form_id=form_id,
-                              field_id=request.get('field_id'),
-                              selection_name=selection_name,
-                              selection_index=request.get('selection_index'),
-                              object_uid=request.get('object_uid'),
-                              uids=request.get('uids'),
-                              listbox_uid=request.get('listbox_uid'))
-if dialog_method == 'Base_createRelation':
-  return context.Base_createRelation(form_id=form_id,
-                              selection_name=selection_name,
-                              selection_index=request.get('selection_index'),
-                              base_category=request.get('base_category'),
-                              object_uid=request.get('object_uid'),
-                              catalog_index=request.get('catalog_index'),
-                              default_module=request.get('default_module'),
-                              dialog_id=dialog_id,
-                              portal_type=request.get('portal_type'),
-                              return_url=request.get('cancel_url'))
-if dialog_method == 'Folder_delete':
-  return context.Folder_delete(form_id=form_id,
-                              field_id=request.get('field_id'),
-                              selection_name=selection_name,
-                              selection_index=request.get('selection_index'),
-                              object_uid=request.get('object_uid'),
-                              uids=request.get('listbox_uid'),
-                              md5_object_uid_list=request.get('md5_object_uid_list'),
-                              cancel_url=request.get('cancel_url'))
-
-try:
-  # Validate the form
-  form = getattr(context,dialog_id)
-  form.validate_all_to_request(request)
-  kw = {}
-  for f in form.get_fields():
-    k = f.id
-    v = getattr(request,k,None)
-    if v is not None:
-      k = k[3:]
-      kw[k] = v
-  url_params = []
-  for (k,v) in kw.items():
-    url_params += ['%s=%s' % (k,v)]
-  url_params_string = join(url_params, '&')
-except FormValidationError, validation_errors:
-  # Pack errors into the request
-  field_errors = form.ErrorFields(validation_errors)
-  request.set('field_errors', field_errors)
-  return form(request)
-
-if url_params_string != '':
-  redirect_url = '%s/%s?%s' % ( context.absolute_url()
-                            , dialog_method
-                            , url_params_string
-                            )
-else:
-  redirect_url = '%s/%s' % ( context.absolute_url()
-                            , dialog_method
-                            )
-
-return request.RESPONSE.redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_callViewDialogMethod.py b/product/ERP5/skins/erp5_core/Base_callViewDialogMethod.py
deleted file mode 100755
index a6b784b40930b96a02cf82213ea6d014e020de58..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_callViewDialogMethod.py
+++ /dev/null
@@ -1,109 +0,0 @@
-## Script (Python) "Base_callViewDialogMethod"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id,cancel_url,dialog_method,selection_name,dialog_id,previous_md5_object_uid_list=None
-##title=
-##
-# Updates attributes of an Zope document
-# which is in a class inheriting from ERP5 Base
-
-
-from Products.Formulator.Errors import ValidationError, FormValidationError
-from string import join
-from ZTUtils import make_query
-
-request=context.REQUEST
-
-#Exceptions for Workflow
-if dialog_method == 'Workflow_statusModify':
-  return context.Workflow_statusModify( form_id=form_id
-                                       , dialog_id=dialog_id
-                                       )
-if dialog_method == 'Base_configureUI':
-  return context.Base_configureUI( form_id=form_id
-                             , selection_name=selection_name
-                             , field_columns=getattr(request,'field_columns')
-                             , stat_columns=getattr(request,'stat_columns')
-                             )
-if dialog_method == 'Base_configureSortOn':
-  return context.Base_configureSortOn( form_id=form_id
-                             , selection_name=selection_name
-                             , field_sort_on=getattr(request,'field_sort_on')
-                             , field_sort_order=getattr(request,'field_sort_order')
-                             )
-
-error_message = ''
-
-try:
-  # Validate the form
-  form = getattr(context,dialog_id)
-  form.validate_all_to_request(request)
-  kw =  { 'form_id'             : form_id
-        , 'selection_name'      : selection_name 
-        , 'selection_index'     : None
-        , 'dialog_id'           : dialog_id
-        } # Missing selection_index
-  has_listbox = 0   
-  for f in form.get_fields():
-    k = f.id
-    v = getattr(request,k,None)
-    if v is not None:
-      if k[0:3] == 'my_':
-        k = k[3:]
-        kw[k] = v
-      elif k in ('import_file', 'listbox'):
-        if f.meta_type == 'ListBox': has_listbox = 1
-        kw[k] = v
-  # Add some properties required by UI
-  kw['cancel_url'] = cancel_url
-  # Redirect if possible, or call directly else
-  if kw.has_key('import_file'):
-    # We can not redirect if we do an import
-    import_file = kw['import_file']
-    return getattr(context,dialog_method)(**kw)
-  if has_listbox:
-    listbox_line_list = []
-    listbox = getattr(request,'listbox',None)
-    listbox_keys = listbox.keys()
-    listbox_keys.sort()
-    for key in listbox_keys:
-      listbox_line = listbox[key]
-      listbox_line['listbox_key'] = key
-      listbox_line_list.append(listbox[key])
-    listbox_line_list = tuple(listbox_line_list)
-    kw['listbox'] = listbox_line_list
-    return getattr(context,dialog_method)(**kw)
-  url_params_string = make_query(kw)
-  # Check if the selection did not changed
-  if previous_md5_object_uid_list is not None:
-    selection_list = context.portal_selections.callSelectionFor(selection_name, context=context)
-    if selection_list is not None:
-      object_uid_list = map(lambda x:x.getObject().getUid(),selection_list)
-      error = context.portal_selections.selectionHasChanged(previous_md5_object_uid_list,object_uid_list)
-      if error:
-        error_message = 'Sorry+your+selection+has+changed'
-  url_params_string = make_query(**kw)
-except FormValidationError, validation_errors:
-  # Pack errors into the request
-  field_errors = form.ErrorFields(validation_errors)
-  request.set('field_errors', field_errors)
-  return form(request)
-
-if error_message != '':
-  redirect_url = '%s/%s?%s' % ( context.absolute_url(), form_id
-                                , 'portal_status_message=%s' % error_message
-                                )
-elif url_params_string != '':
-  redirect_url = '%s/%s?%s' % ( context.absolute_url()
-                            , dialog_method
-                            , url_params_string
-                            )
-else:
-  redirect_url = '%s/%s' % ( context.absolute_url()
-                            , dialog_method
-                            )
-
-return request.RESPONSE.redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_cancel.py b/product/ERP5/skins/erp5_core/Base_cancel.py
deleted file mode 100755
index 4efdeccc46e48996e69769f2c98f1842ec050c8f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_cancel.py
+++ /dev/null
@@ -1,18 +0,0 @@
-## Script (Python) "Base_cancel"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id,cancel_url
-##title=
-##
-# Updates attributes of an Zope document
-# which is in a class inheriting from ERP5 Base
-
-
-from Products.Formulator.Errors import ValidationError, FormValidationError
-
-request=context.REQUEST
-
-request[ 'RESPONSE' ].redirect( cancel_url )
diff --git a/product/ERP5/skins/erp5_core/Base_configureSortOn.py b/product/ERP5/skins/erp5_core/Base_configureSortOn.py
deleted file mode 100755
index 31ab29239fe6460b60bc27614467d609bbc26ec6..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_configureSortOn.py
+++ /dev/null
@@ -1,38 +0,0 @@
-## Script (Python) "Base_configureSortOn"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id,selection_name,field_sort_on,field_sort_order
-##title=
-##
-# Updates attributes of an Zope document
-# which is in a class inheriting from ERP5 Base
-
-
-from Products.Formulator.Errors import ValidationError, FormValidationError
-
-request=context.REQUEST
-
-
-try:
-  # No validation for now
-  # Direct access to field (BAD)
-  sort_on = []
-  i = 0
-  for k in field_sort_on:
-    if k != 'None':
-      v = field_sort_order[i]
-      sort_on += [(k,v)]
-    i += 1
-  context.portal_selections.setSelectionSortOrder(selection_name, sort_on)
-except FormValidationError, validation_errors:
-  # Pack errors into the request
-  field_errors = form.ErrorFields(validation_errors)
-  request.set('field_errors', field_errors)
-  return form(request)
-else:
-  redirect_url = context.portal_selections.getSelectionListUrlFor(selection_name)
-
-request[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_configureUI.py b/product/ERP5/skins/erp5_core/Base_configureUI.py
deleted file mode 100755
index a6e8c43394f1fced6903bf7d3a1dfa2ebc78ecb6..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_configureUI.py
+++ /dev/null
@@ -1,87 +0,0 @@
-## Script (Python) "Base_configureUI"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id,selection_name,field_columns,stat_columns
-##title=
-##
-# Updates attributes of an Zope document
-# which is in a class inheriting from ERP5 Base
-
-
-from Products.Formulator.Errors import ValidationError, FormValidationError
-
-
-request=context.REQUEST
-
-
-# Columns which occure more than once are replace by 'None'
-# We do this because this causes problems everywhere and because
-# in most cases, it is meaningless. 'None' elements will then be moved
-# to the end of the list.
-
-for x in range(len(field_columns)):
-  if field_columns.count(field_columns[x]) > 1:
-    field_columns[x] = 'None'
-    stat_columns[x] = ' '
-
-
-# The file named "form_list_ui.pt" displays first, columns in selection and then, those
-# which are defined by default in the corresponding listbox properties. So field_columns
-# and stat_columns may not be ordered the same way. So the script below sort the
-# field_column list so as to have every 'None' at the end of the list
-
-
-liste_none = []
-
-def maj_liste_none():
-  for x in range(len(field_columns)):
-    if field_columns[x] == 'None':
-      liste_none.append(x)
-
-
-maj_liste_none()
-
-for x in range(len(field_columns)):
-  if len(liste_none) > 0 and field_columns[x] != 'None' and liste_none[0] < x:
-    field_columns[liste_none[0]] = field_columns[x]
-    stat_columns[liste_none[0]] = stat_columns[x]
-    field_columns[x] = 'None'
-    stat_columns[x] = ' '
-    liste_none.pop(0)
-    maj_liste_none()
-
-# Now, we can try to save the selection
-
-
-try:
-  context.portal_selections.setSelectionStats(selection_name, stat_columns, REQUEST=request)
-except:
-  return('L\'enregistrement des éléments statistiques n\'a pas fonctionné')
-
-try:
-  # No validation for now
-  # Direct access to field (BAD)
-  form = getattr(context,form_id)
-  groups = form.get_groups()
-  columns_dict = {}
-
-  for (k, v) in [('None','None')] + form.get_fields_in_group(groups[0])[0].get_value('all_columns'):
-    if k in field_columns and k != 'None':
-      columns_dict[k] = v
-  columns = []
-  for k in field_columns:
-    if k != 'None':
-      columns += [(k ,  columns_dict[k])]
-  context.portal_selections.setSelectionColumns(selection_name, columns, REQUEST=request)
-except FormValidationError, validation_errors:
-  # Pack errors into the request
-  field_errors = form.ErrorFields(validation_errors)
-  request.set('field_errors', field_errors)
-  return form(request)
-else:
-  redirect_url = context.portal_selections.getSelectionListUrlFor(selection_name)
-
-request[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_convertDateListToChartList.py b/product/ERP5/skins/erp5_core/Base_convertDateListToChartList.py
deleted file mode 100755
index a9c4f617534b21b65c2c52265b29150c650332bb..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_convertDateListToChartList.py
+++ /dev/null
@@ -1,34 +0,0 @@
-## Script (Python) "Base_convertDateListToChartList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=list=[]
-##title=
-##
-# This scripts allows to update a list so that it
-# can be displayed correctly in a graph
-# The list given have to be of the forme:
-#  list = [[Datetime(),value (,value)*],([Datetime(),value (,value)*])*]
-
-list.sort()
-
-# Check if there is any none value, and replace it by 0
-
-formated_list = []
-if len(list) >= 1:
-  for i in range(len(list)):
-    for index_value in range(1,len(list[0])):
-      if list[i][index_value]==None:
-        list[i][index_value]=0
-  formated_list.append(list[0])
-  for i in range(1,len(list)):
-    nb_days = int(list[i][0]-list[i-1][0])
-    for day in range(1,nb_days):
-      formated_list.append([list[i-1][0]+day])
-      for nb_value in range(1,len(list[i-1])):
-        formated_list[len(formated_list)-1].append(list[i-1][nb_value])
-    formated_list.append(list[i])
-
-return formated_list
diff --git a/product/ERP5/skins/erp5_core/Base_convertVariationListToQuantityList.py b/product/ERP5/skins/erp5_core/Base_convertVariationListToQuantityList.py
deleted file mode 100755
index 42502d678bda6c50c88ac8ac821d99fd915c245a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_convertVariationListToQuantityList.py
+++ /dev/null
@@ -1,40 +0,0 @@
-## Script (Python) "Base_convertVariationListToQuantityList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=list=[],initial_quantity=[]
-##title=
-##
-# This scripts allows to update a list so that it
-# converts variation on a quantity to the quantity itself
-# ie, if list=[[DateTime('09/10/2003'),+4],[DateTime('09/19/2003'),-8]], 
-# and initial_quantity = [3]
-# result: [[DateTime('2003/09/10'), 7], [DateTime('2003/09/19'), -1]]
-# The list given have to be of the forme:
-#  list = [[Datetime(),value (,value)*],([Datetime(),value (,value)*])*]
-# The initial_quantity have to be like this :
-#  initial_quantity = [value (,value)*]
-
-
-list.sort()
-
-quantity_list = []
-#if type(initial_quantity) is type(1):
-#  initial_quantity = [initial_quantity]
-
-if len(list) >= 1 and (len(list[0])-1)==len(initial_quantity):
-  quantity_list.append([list[0][0]])
-  for i in range(1,len(list[0])):
-    if list[0][i]==None:
-      list[0][i]=0
-    quantity_list[0].append(initial_quantity[i-1] + list[0][i])
-  for value in range(1,len(list)):
-    quantity_list.append([list[value][0]])
-    for i in range(1,len(list[0])):
-      if list[value][i]==None:
-        list[value][i]=0
-      quantity_list[value].append(quantity_list[value-1][i] + list[value][i])
-
-return quantity_list
diff --git a/product/ERP5/skins/erp5_core/Base_createNewDocument.py b/product/ERP5/skins/erp5_core/Base_createNewDocument.py
deleted file mode 100755
index 2af0a198f2b01fd72804ee1cef28e914c42c4bed..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_createNewDocument.py
+++ /dev/null
@@ -1,30 +0,0 @@
-## Script (Python) "Base_createNewDocument"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-REQUEST=context.REQUEST
-
-# Add an object of the same type as self
-parent = context.aq_parent
-# XXX May be this need to be changed in order to get something else than
-# the permission "Add portal content"
-new_id = parent.generateNewId()
-context.portal_types.constructContent(type_name=context.portal_type,
-                        container=parent,
-                        id=str(new_id),
-                        RESPONSE=REQUEST.RESPONSE)
-# parent[new_id].flushActivity(invoke=1)
-# parent.invokeFactory(type_name=context.portal_type,
-#       id=str(parent.generateNewId()),
-#        RESPONSE=REQUEST.RESPONSE)
-#parent.portal_types.constructContent(type_name=context.portal_type,
-#     container=context,
-#     id=str(parent.generateNewId()),
-#      RESPONSE=REQUEST.RESPONSE)
-
-return REQUEST.RESPONSE
diff --git a/product/ERP5/skins/erp5_core/Base_createRelation.py b/product/ERP5/skins/erp5_core/Base_createRelation.py
deleted file mode 100755
index ef312990d649e3783b9056dc1246a59a7b779a9e..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_createRelation.py
+++ /dev/null
@@ -1,101 +0,0 @@
-## Script (Python) "Base_createRelation"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id, dialog_id, selection_index, selection_name, object_uid, base_category, catalog_index, portal_type, default_module, return_url
-##title=
-##
-# Updates attributes of an Zope document
-# which is in a class inheriting from ERP5 Base
-
-request=context.REQUEST
-
-o = context.portal_catalog.getObject(object_uid)
-
-form = getattr(context,dialog_id)
-form.validate_all_to_request(request)
-my_field = form.get_fields()[0]
-k = my_field.id
-values = getattr(request,k,None)
-module = context.restrictedTraverse(default_module)
-
-ref_list = []
-
-for v in values:
-  if catalog_index == 'id':
-    # We should not edit the id field
-    # because the object which is created is not attached to a
-    # module yet
-    id = v
-  else:
-    id=str(module.generateNewId())
-  module.invokeFactory(type_name=portal_type,id=id)
-  new_ob = module.get(id)
-  kw = {}
-  if catalog_index != 'id':
-    kw[catalog_index] = v
-    new_ob.edit(**kw)
-  ref_list.append(new_ob)
-  new_ob.flushActivity(invoke=1)
-
-o.setValue(base_category, ref_list, portal_type=[portal_type])
-
-return request[ 'RESPONSE' ].redirect( return_url )
-
-
-try:
-  # Validate the form
-  form = getattr(context,form_id)
-  form.validate_all_to_request(request)
-  my_field = None
-  # Find out which field defines the relation
-  for f in form.get_fields():
-    if f.has_value( 'base_category'):
-      if f.get_value('base_category') == base_category:
-        k = f.id
-        v = getattr(request,k,None)
-        if v != context.getProperty(k[3:]):
-          my_field = f
-  if my_field:
-    kw ={}
-    kw[my_field.get_value('catalog_index')] = request.get( my_field.id, None)
-    context.portal_selections.setSelectionParamsFor('Base_viewRelatedObjectList', kw.copy())
-    kw['base_category'] = base_category
-    kw['portal_type'] = my_field.get_value('portal_type')
-    request.set('base_category', base_category)
-    request.set('portal_type', my_field.get_value('portal_type'))
-    request.set('form_id', 'Base_viewRelatedObjectList')
-    request.set(my_field.get_value('catalog_index'), request.get( my_field.id, None))
-    relation_list = context.portal_catalog(**kw)
-    if len(relation_list) > 0:
-      return context.Base_viewRelatedObjectList( REQUEST=request )
-    else:
-      request.set('catalog_index', my_field.get_value('catalog_index'))
-      request.set('relation_values', request.get( my_field.id, None))
-      return context.Base_viewCreateRelationDialog( REQUEST=request )
-      pass
-      # context.newRelation(base_category, my_field.get_value('portal_type'))
-except FormValidationError, validation_errors:
-  # Pack errors into the request
-  field_errors = form.ErrorFields(validation_errors)
-  request.set('field_errors', field_errors)
-  return form(request)
-else:
-  message = 'Relation+Unchanged.'
-
-if not selection_index:
-  redirect_url = '%s/%s?%s' % ( o.absolute_url()
-                            , form_id
-                            , 'portal_status_message=%s' % message
-                            )
-else:
-  redirect_url = '%s/%s?selection_index=%s&selection_name=%s&%s' % ( o.absolute_url()
-                            , form_id
-                            , selection_index
-                            , selection_name
-                            , 'portal_status_message=%s' % message
-                            )
-
-request[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_doAction.py b/product/ERP5/skins/erp5_core/Base_doAction.py
deleted file mode 100755
index 0b194e8523b30b77a2b3b76c43cd9cb0cd256ba5..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_doAction.py
+++ /dev/null
@@ -1,44 +0,0 @@
-## Script (Python) "Base_doAction"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=action_select=None, form_id='', selection_index='', selection_name='', uids=None, listbox_uid=None, md5_object_uid_list=None, is_list=0
-##title=
-##
-if not action_select : return
-
-is_list = int(is_list)
-
-Base_doAction = action_select.split()
-doAction0 = Base_doAction[0]
-request = context.REQUEST
-
-# First, update checked uids if uids is not None.
-context.portal_selections.updateSelectionCheckedUidList(selection_name, uids=uids, listbox_uid=listbox_uid, REQUEST=request)
-
-# If this is an object, a workflow or a folder, then jump to that view
-if doAction0 in ('object', 'workflow', 'folder'):
-  uri = ' '.join(Base_doAction[1:])
-  if uri.find('?') >= 0:
-    uri += '&'
-  else:
-    uri += '?'
-  uri += 'form_id=%s&selection_index=%s&selection_name=%s' % (form_id, selection_index, selection_name)
-  if md5_object_uid_list is not None and is_list == 1:
-    uri += '&previous_md5_object_uid_list=%s' % md5_object_uid_list
-  if doAction0 == 'object':
-    uri += '&dialog_category=object_action'
-  return request.RESPONSE.redirect(uri)
-# Otherwise, check if this is an automatic menu (add)
-elif doAction0 == 'add':
-  new_id = context.generateNewId()
-  context.portal_types.constructContent(type_name=' '.join(Base_doAction[1:]),
-                           container=context,
-                           id=str(new_id),
-                           RESPONSE=request.RESPONSE)
-  # context[new_id].flushActivity(invoke=1)
-  return request.RESPONSE
-
-return getattr(context,form_id)(request)
diff --git a/product/ERP5/skins/erp5_core/Base_doDialog.py b/product/ERP5/skins/erp5_core/Base_doDialog.py
deleted file mode 100755
index 71f151943951b39cb16671766cadcd057ebdfc01..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_doDialog.py
+++ /dev/null
@@ -1,19 +0,0 @@
-## Script (Python) "Base_doDialog"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=dialog_select=None, form_id, dialog_category, selection_name, cancel_url
-##title=
-##
-if not dialog_select : return
-
-import string
-
-Base_doAction = dialog_select.split()
-doAction0 = Base_doAction[0]
-request = context.REQUEST
-
-return request.RESPONSE.redirect(doAction0 + '?selection_name=%s&dialog_category=%s&cancel_url=%s&form_id=%s' %
-          (selection_name, dialog_category, cancel_url, form_id) )
diff --git a/product/ERP5/skins/erp5_core/Base_doFavorite.py b/product/ERP5/skins/erp5_core/Base_doFavorite.py
deleted file mode 100755
index 5ff08d5dcc36527ad7ad6a229cfee354a677386f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_doFavorite.py
+++ /dev/null
@@ -1,35 +0,0 @@
-## Script (Python) "Base_doFavorite"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=favorite_select=None, form_id=''
-##title=
-##
-if not favorite_select : return
-
-import string
-
-#Base_doAction = favorite_select.split() Previous implementation
-if favorite_select.find('local_roles=') > 0:
-  # Some local roles are defined
-  url_items = favorite_select.split('&') # split parameters
-  new_items = []
-  for item in url_items:
-    if item.find('local_roles=') >= 0:
-      local_roles = item[item.find('local_roles='):].split(';')
-      for role in local_roles:
-        role = role.split('=')
-        if len(role[len(role)-1]) > 0:
-          new_items.append("local_roles:list=%s" % role[len(role)-1])
-    else:
-      new_items.append(item)
-      
-  favorite_select = '&'.join(new_items)
-
-Base_doAction = (favorite_select,)
-doAction0 = Base_doAction[0]
-request = context.REQUEST
-
-return request.RESPONSE.redirect(doAction0)
diff --git a/product/ERP5/skins/erp5_core/Base_doJump.py b/product/ERP5/skins/erp5_core/Base_doJump.py
deleted file mode 100755
index 470efec62624bbe83d95d24dda98828bdbbb40e4..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_doJump.py
+++ /dev/null
@@ -1,18 +0,0 @@
-## Script (Python) "Base_doJump"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=jump_select=None, form_id=''
-##title=
-##
-if not jump_select : return
-
-import string
-
-Base_doAction = jump_select.split()
-doAction0 = Base_doAction[0]
-request = context.REQUEST
-
-return request.RESPONSE.redirect(doAction0)
diff --git a/product/ERP5/skins/erp5_core/Base_doLanguage.py b/product/ERP5/skins/erp5_core/Base_doLanguage.py
deleted file mode 100755
index 43e379634f36be8522c290bbcabb93d957a71c23..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_doLanguage.py
+++ /dev/null
@@ -1,19 +0,0 @@
-## Script (Python) "doLanguage"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=language_select=None
-##title=
-##
-if not language_select : return 
-
-from Products.ERP5Type.Cache import clearCache
-
-# XXX Localizer-dependent
-portal = context.getPortalObject()
-portal.Localizer.changeLanguage(language_select)
-
-# XXX should invalidate cached data specific to current user
-clearCache()
diff --git a/product/ERP5/skins/erp5_core/Base_doModule.py b/product/ERP5/skins/erp5_core/Base_doModule.py
deleted file mode 100755
index 4bbf358a07f4a8de021e47cd1b4d2c68c8c06b15..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_doModule.py
+++ /dev/null
@@ -1,18 +0,0 @@
-## Script (Python) "Base_doModule"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=module_select=None, form_id=''
-##title=
-##
-if not module_select : return
-import string
-
-Base_doAction = module_select.split()
-doAction0 = Base_doAction[0]
-doAction0 += '/view'
-request = context.REQUEST
-
-return request.RESPONSE.redirect(doAction0)
diff --git a/product/ERP5/skins/erp5_core/Base_doSelect.py b/product/ERP5/skins/erp5_core/Base_doSelect.py
deleted file mode 100755
index 2faebe033ee7d7a4af3ab1774e24851e7caca94f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_doSelect.py
+++ /dev/null
@@ -1,52 +0,0 @@
-## Script (Python) "Base_doSelect"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id='', selection_index='', selection_name='', list_method_id=None
-##title=
-##
-from ZTUtils import make_query
-
-request = context.REQUEST
-
-#return request
-
-if list_method_id:
-  kw = { 'selection_index': selection_index,
-         'selection_name': selection_name,
-         'list_method_id': list_method_id,
-        }
-else:
-  kw = { 'selection_index': selection_index,
-         'selection_name': selection_name,
-        }
-
-if list_method_id:
-  try:
-    # Define form basic fields
-    form = getattr(context,form_id)
-    listbox_field = None
-    # Search listbox
-    for f in form.get_fields():
-      if f.meta_type == "ListBox":
-        listbox_field = f
-        break
-    # Lookup listbox Base_viewSearchResultList cols
-    for col_id, col_title in listbox_field.get_value('search_columns'):
-      # Left is col_id
-      v = request.form.get(col_id, '')
-      kw[col_id] = v
-    # Redirect
-    request.RESPONSE.redirect('%s/%s?%s' % (context.absolute_url(), form_id, make_query(kw)))
-  except:
-    # Default behaviour is not as great but returns something
-    return getattr(context,form_id)(request)
-else:
-  # Default behaviour is not as great but returns something
-  kw.update(request.form)
-  if kw.has_key('listbox_uid'): del kw['listbox_uid']
-  if kw.has_key('list_start'): del kw['list_start']
-  request.RESPONSE.redirect('%s/%s?%s' % (context.absolute_url(), form_id, make_query(kw)))
-  #return getattr(context,form_id)(request)
diff --git a/product/ERP5/skins/erp5_core/Base_download.py b/product/ERP5/skins/erp5_core/Base_download.py
deleted file mode 100755
index 919f5237d34e1896df5b056fb9db89b002973997..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_download.py
+++ /dev/null
@@ -1,12 +0,0 @@
-## Script (Python) "Base_download"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-request=context.REQUEST
-redirect_url = context.absolute_url()
-return request.RESPONSE.redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_edit.py b/product/ERP5/skins/erp5_core/Base_edit.py
deleted file mode 100755
index 2c400097499a6d90f6fcc190e83dc687de1f431d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_edit.py
+++ /dev/null
@@ -1,145 +0,0 @@
-## Script (Python) "Base_edit"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id, selection_index=0, selection_name=''
-##title=
-##
-# Updates attributes of an Zope document
-# which is in a class inheriting from ERP5 Base
-#
-# TODO
-#   - Implement validation of matrix fields
-#   - Implement validation of list fields
-#
-
-from Products.Formulator.Errors import ValidationError, FormValidationError
-
-request=context.REQUEST
-
-try:
-  # Define form basic fields
-  form = getattr(context,form_id)
-  # Validate
-  form.validate_all_to_request(request)
-  # Basic attributes
-  kw = {}
-  # Parse attributes
-  for f in form.get_fields():
-    k = f.id
-    v = getattr(request,k,None)
-    if v is not None:
-      if k[0:3] == 'my_':
-        # We only take into account
-        # the object attributes
-        k = k[3:]
-        kw[k] = v
-  #return str(kw)
-  # Update matrix attributes
-  matrixbox = request.get('matrixbox')
-  if matrixbox is not None:
-    matrixbox_field = form.get_field('matrixbox')
-    cell_base_id = matrixbox_field.get_value('cell_base_id')
-    kd = {}
-    kd['base_id'] = cell_base_id
-    gv = {}
-    if matrixbox_field.has_value('global_attributes'):
-      hidden_attributes = map(lambda x:x[0], matrixbox_field.get_value('global_attributes'))
-      for k in hidden_attributes:
-        gv[k] = getattr(request, k,None)
-    if matrixbox_field.get_value('update_cell_range'):
-      # Update cell range each time it is modified
-      lines = matrixbox_field.get_value('lines')
-      columns = matrixbox_field.get_value('columns')
-      tabs = matrixbox_field.get_value('tabs')
-      column_ids = map(lambda x: x[0], columns)
-      line_ids = map(lambda x: x[0], lines)
-      tab_ids = map(lambda x: x[0], tabs)
-      # There are 2 cases
-      # Case 1: we do 2 dimensional matrices
-      # Case 2: we do 2 dimensinal matrices + tabs
-      # In Case 1, we set a 2 dimension range
-      # In Case 2, we set a 3 dimension range
-      # If tab_id is None, we are in Case 1
-      cell_range = context.getCellRange(base_id = cell_base_id)
-      if len(tab_ids) == 0:
-        matrixbox_cell_range = [line_ids, column_ids]
-      elif tab_ids[0] == None:
-        matrixbox_cell_range = [line_ids, column_ids]
-      else:
-        matrixbox_cell_range = [line_ids, column_ids, tab_ids]
-      if cell_range != matrixbox_cell_range:
-        if len(tab_ids) == 0:
-          context.setCellRange(line_ids, column_ids, base_id=cell_base_id)
-        elif tab_ids[0] == None:
-          context.setCellRange(line_ids, column_ids, base_id=cell_base_id)
-        else:
-          context.setCellRange(line_ids, column_ids, tab_ids, base_id=cell_base_id)
-    for k,v in matrixbox.items():
-        # Only update cells which still exist
-        if context.hasInRange(*k, **kd):
-          c = context.newCell(*k, **kd)
-          if c is not None:
-            c.edit(**gv)  # First update globals which include the def. of property_list
-            if v.has_key('variated_property'):
-              # For Variated Properties
-              value = v['variated_property']
-              del v['variated_property']
-              if gv.has_key('mapped_value_property_list'):
-                # Change the property which is defined by the
-                # first element of mapped_value_property_list
-                # XXX May require some changes with Sets
-                key = gv['mapped_value_property_list'][0]
-                v[key] = value
-            c.edit(**v) # and update the cell specific values
-          else:
-            return "Could not create cell %s" % str(k)
-        else:
-          return "Cell %s does not exist" % str(k)
-  # Update listbox attributes
-  listbox = request.get('listbox')
-  if listbox is not None:
-    listbox_field = form.get_field('listbox')
-    gv = {}
-    if listbox_field.has_value('global_attributes'):
-      hidden_attributes = map(lambda x:x[0], listbox_field.get_value('global_attributes'))
-      for k in hidden_attributes:
-        gv[k] = getattr(request, k,None)
-    for url, v in listbox.items():
-      o = context.restrictedTraverse(url)
-      v.update(gv)
-      o.edit(**v)
-      o.flushActivity(method_id="immediateReindexObject",
-                         invoke = 1) # This is required if we wish to provide immediate display
-      o.flushActivity(method_id="recursiveImmediateReindexObject",
-                               invoke = 1) # Requires if we want to display indexed subobject data... but long
-      # However it seems it reindexed many many times... XXX
-      # Maybe we should build a list of objects we need
-  # Update basic attributes
-  context.edit(REQUEST=request,**kw)
-#except:
-#  raise
-except FormValidationError, validation_errors:
-  # Pack errors into the request
-  field_errors = form.ErrorFields(validation_errors)
-  request.set('field_errors', field_errors)
-  return form(request)
-else:
-  if not selection_index:
-    redirect_url = '%s/%s?%s' % ( context.absolute_url()
-                              , form_id
-                              , 'portal_status_message=Data+Updated.'
-                              )
-  else:
-    redirect_url = '%s/%s?selection_index=%s&selection_name=%s&%s' % ( context.absolute_url()
-                              , form_id
-                              , selection_index
-                              , selection_name
-                              , 'portal_status_message=Data+Updated.'
-                              )
-
-
-
-request[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_editRelation.py b/product/ERP5/skins/erp5_core/Base_editRelation.py
deleted file mode 100755
index 5f90f3065a80f28de806aa2b484c3ab2914e906f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_editRelation.py
+++ /dev/null
@@ -1,74 +0,0 @@
-## Script (Python) "Base_editRelation"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id, field_id, selection_index, selection_name, uids, object_uid, listbox_uid
-##title=
-##
-# Updates attributes of an Zope document
-# which is in a class inheriting from ERP5 Base
-
-
-from Products.Formulator.Errors import ValidationError, FormValidationError
-
-request=context.REQUEST
-
-o = context.portal_catalog.getObject(object_uid)
-
-if o is None:
-  return "Sorrry, Error, the calling object was not catalogued. Do not know how to do ?"
-
-if listbox_uid is not None:
-  selected_uids = context.portal_selections.updateSelectionCheckedUidList(selection_name,listbox_uid,uids)
-  uids = context.portal_selections.getSelectionCheckedUidsFor(selection_name)
-
-if request.has_key('previous_form_id'):
-  previous_form_id = request.get('previous_form_id')
-  if previous_form_id != '':
-    form_id = previous_form_id
-
-form = getattr(context, form_id)
-field = form.get_field(field_id)
-base_category = field.get_value('base_category')
-relation_setter_id = field.get_value('relation_setter_id')
-if relation_setter_id: relation_setter = getattr(o, relation_setter_id)
-portal_type = map(lambda x:x[0],field.get_value('portal_type'))
-
-if uids != []:
-  if relation_setter_id:
-    # Clear the relation
-    relation_setter((), portal_type=portal_type)
-    # Warning, portal type is at strange value because of form
-    # And update it
-    relation_setter(uids, portal_type=portal_type)
-  else:
-    # Clear the relation
-    o.setValueUids(base_category, (), portal_type=portal_type)
-    # Warning, portal type is at strange value because of form
-    # And update it
-    o.setValueUids(base_category, uids, portal_type=portal_type)
-else:
-  if relation_setter_id:
-    # Clear the relation
-    relation_setter((), portal_type=portal_type)
-  else:    
-    # Clear the relation
-    o.setValueUids(base_category,  (), portal_type=portal_type)
-
-if not selection_index:
-  redirect_url = '%s/%s?%s' % ( o.absolute_url()
-                            , form_id
-                            , 'portal_status_message=Data+Updated.'
-                            )
-else:
-  redirect_url = '%s/%s?selection_index=%s&selection_name=%s&%s' % ( o.absolute_url()
-                            , form_id
-                            , selection_index
-                            , selection_name
-                            , 'portal_status_message=Data+Updated.'
-                            )
-
-
-request[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_jumpToAccountingTransaction.py b/product/ERP5/skins/erp5_core/Base_jumpToAccountingTransaction.py
deleted file mode 100755
index c83c3f0448d95472cc42f38478fce69a236835b7..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_jumpToAccountingTransaction.py
+++ /dev/null
@@ -1,33 +0,0 @@
-## Script (Python) "Base_jumpToAccountingTransaction"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=from_account=None, from_entity=None
-##title=
-##
-# You can use this script to jump to accounting module without making the URL longer.
-# Like 'erp5/organisation/purchase_order/accounting/view'.
-#
-# Usage: .../Base_jumpToAccountingTransaction?from_entity=1
-#
-# Use from_account to display only transaction related to the account you come from, and from_entity if you come from an organisation or person
-
-request=context.REQUEST
-
-redirect_url = '%s/accounting/view' % context.getPortalObject().absolute_url()
-
-separator = '?'
-
-if from_account:
-  redirect_url += '%snode:list=%s' % (separator, context.getRelativeUrl())
-  separator = '&'
-
-elif from_entity:
-  redirect_url += '%sentity=%s' % (separator, context.getRelativeUrl())
-  separator = '&'
-
-redirect_url += '%sreset=1' % separator
-
-request[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_jumpToRelatedDocument.py b/product/ERP5/skins/erp5_core/Base_jumpToRelatedDocument.py
deleted file mode 100755
index 17a5631d039647e04b19906a91848d3c692f0665..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_jumpToRelatedDocument.py
+++ /dev/null
@@ -1,39 +0,0 @@
-## Script (Python) "Base_jumpToRelatedDocument"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id, field_id, selection_index=0, selection_name=''
-##title=
-##
-# Updates attributes of an Zope document
-# which is in a class inheriting from ERP5 Base
-
-
-from ZTUtils import make_query
-
-request=context.REQUEST
-
-#return request
-
-
-#selection = context.portal_selections.getSelectionFor('modele_view')
-#context.portal_selections.setSelectionFor('jump_relation',selection)
-#return "ok"
-
-form = getattr(context,form_id)
-field = form.get_field(field_id)
-base_category = field.get_value('base_category')
-portal_type = map(lambda x:x[0],field.get_value('portal_type'))
-jump_reference_list = context.getAcquiredValueList(base_category, portal_type=portal_type)
-if len(jump_reference_list)==1:
-  jump_reference = jump_reference_list[0]
-  return request[ 'RESPONSE' ].redirect( '%s/view' % jump_reference.absolute_url() )
-else:
-  selection_uid_list = map(lambda x:x.getUid(),jump_reference_list)
-  kw = {'uid': selection_uid_list}
-  context.portal_selections.setSelectionParamsFor('Base_jumpToRelatedObjectList',kw)
-  request.set('object_uid', context.getUid())
-  request.set('uids', selection_uid_list)
-  return context.Base_jumpToRelatedObjectList(uids=selection_uid_list, REQUEST=request)
diff --git a/product/ERP5/skins/erp5_core/Base_jumpToRelatedObjectList.form b/product/ERP5/skins/erp5_core/Base_jumpToRelatedObjectList.form
deleted file mode 100755
index 0da9a9bb4bcfe65ea5ca638147702f70ed6db29f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_jumpToRelatedObjectList.form
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Jump Relation</title>
-  <row_length>4</row_length>
-  <name>Jump Relation</name>
-  <pt>form_list</pt>
-  <action></action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[('id', 'id'), ('portal_type', 'Portal Type'), ('Title', 'Title'), ('Description', 'Description')]</all_columns>
-          <all_editable_columns></all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('portal_type', 'Portal Type'), ('Title', 'Title'), ('Description', 'Description')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('portal_type', "''"), ('Title', "''"), ('Description', "''")]</default_params>
-          <description></description>
-          <domain_root_list></domain_root_list>
-          <domain_tree></domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns></editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes></global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action></list_action>
-          <list_cookie>SEARCH_LIST</list_cookie>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list></report_root_list>
-          <report_tree></report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">0</select>
-          <selection_name>Base_jumpToRelatedObjectList</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Relation Results</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/Base_redirect.py b/product/ERP5/skins/erp5_core/Base_redirect.py
deleted file mode 100755
index 1e9f2bc65b663d304f63724f235e3d53facf744a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_redirect.py
+++ /dev/null
@@ -1,24 +0,0 @@
-## Script (Python) "Base_redirect"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=relative_url=None
-##title=
-##
-# You can use this script to jump to another module / document without making the URL longer.
-# Like 'erp5/organisation/purchase_order/accounting/view'.
-#
-# Usage: .../Base_redirect?relative_url=purchase_order
-#
-# If you omit the parameter relative_url, this jumps to the portal (i.e. ERP5 Site).
-
-request=context.REQUEST
-
-if relative_url is None:
-  redirect_url = '%s/view' % (context.getPortalObject().absolute_url())
-else:
-  redirect_url = '%s/%s/view' % (context.getPortalObject().absolute_url(), relative_url)
-
-request[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_renameCategory.py b/product/ERP5/skins/erp5_core/Base_renameCategory.py
deleted file mode 100755
index fc5c61a1971af3299b58e40b8c776e95cec79e64..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_renameCategory.py
+++ /dev/null
@@ -1,30 +0,0 @@
-## Script (Python) "Base_renameCategory"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=from_cat = None, to_cat = None
-##title=
-##
-new_category_list = ()
-from_cat = from_cat + '/'
-to_cat = to_cat + '/'
-has_changed = 0
-
-if from_cat is not None and to_cat is not None:
-  for o in context.objectValues():
-    has_changed = 0
-    new_category_list = ()
-    for cat in o.getCategoryList():
-      if cat.find(from_cat) == 0:
-        cat = to_cat + cat[len(from_cat):]
-        has_changed = 1
-      new_category_list += (cat,)
-    if has_changed == 1:
-      o.setCategoryList(new_category_list)
-      print "changed category %s with %s on %s" % (str(from_cat),str(to_cat),str(o.getPath()))
-
-
-print " "
-return printed
diff --git a/product/ERP5/skins/erp5_core/Base_showUpdateDialog.py b/product/ERP5/skins/erp5_core/Base_showUpdateDialog.py
deleted file mode 100755
index f42a1edaf3fc163e1d6267920d374712213d8640..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_showUpdateDialog.py
+++ /dev/null
@@ -1,14 +0,0 @@
-## Script (Python) "Base_showUpdateDialog"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id,cancel_url,dialog_method,selection_name,dialog_id,update_method
-##title=
-##
-# This script is only used in order to add a third button on
-# dialog pages wich is only used for udpates
-
-dialog_method = update_method
-return context.Base_callDialogMethod(form_id,cancel_url,dialog_method,selection_name,dialog_id,enable_pickle=1)
diff --git a/product/ERP5/skins/erp5_core/Base_sortObjectListLikeSQL.py b/product/ERP5/skins/erp5_core/Base_sortObjectListLikeSQL.py
deleted file mode 100755
index c5f97eb4e1549fe8a9397950b621a6f66e7b2954..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_sortObjectListLikeSQL.py
+++ /dev/null
@@ -1,25 +0,0 @@
-## Script (Python) "Base_sortObjectListLikeSQL"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=unordered_list=[], sort_order=()
-##title=
-##
-def generic_sort(a,b):
-  result = 0
-  for k,v in sort_order:
-    a_value = a.getProperty(k)
-    b_value = b.getProperty(k)
-    result = cmp(a_value,b_value)
-    if result:
-      if v in ('DESC', 'desc', 'descending', 'reverse'):
-        return -result
-      else:
-        return result
-  return result 
-
-unordered_list = map(lambda x: x.getObject(), unordered_list)
-unordered_list.sort(generic_sort)
-return unordered_list
diff --git a/product/ERP5/skins/erp5_core/Base_updateDialogForm.py b/product/ERP5/skins/erp5_core/Base_updateDialogForm.py
deleted file mode 100755
index 90fb3bca60bfd6d4f39bc4685821a5382c4a0c2d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_updateDialogForm.py
+++ /dev/null
@@ -1,30 +0,0 @@
-## Script (Python) "Base_updateDialogForm"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=**kw
-##title=
-##
-from string import zfill
-request = context.REQUEST
-
-from string import zfill
-
-for k in kw.keys():
-  v = kw[k]
-  if k == 'listbox':
-    listbox = {}
-    if v is not None:
-      i = 1
-      for line in v:
-        if line.has_key('listbox_key'):
-          key = '%s' % line['listbox_key']
-        else:
-          key = str(zfill(i,3))
-        listbox[key] = line
-        i+=1
-      request.set('listbox',listbox)
-  else:
-    request.set('my_%s' % k, v)
diff --git a/product/ERP5/skins/erp5_core/Base_updateRelation.py b/product/ERP5/skins/erp5_core/Base_updateRelation.py
deleted file mode 100755
index ff06af6e4ee4875a36eeddf80044f0e2bb85eb5b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_updateRelation.py
+++ /dev/null
@@ -1,74 +0,0 @@
-## Script (Python) "Base_updateRelation"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id, field_id, selection_index, selection_name, uids, object_uid, listbox_uid
-##title=
-##
-# Updates attributes of an Zope document
-# which is in a class inheriting from ERP5 Base
-
-
-from Products.Formulator.Errors import ValidationError, FormValidationError
-
-request=context.REQUEST
-
-o = context.portal_catalog.getObject(object_uid)
-
-if o is None:
-  return "Sorrry, Error, the calling object was not catalogued. Do not know how to do ?"
-
-if listbox_uid is not None:
-  selected_uids = context.portal_selections.updateSelectionCheckedUidList(selection_name,listbox_uid,uids)
-  uids = context.portal_selections.getSelectionCheckedUidsFor(selection_name)
-
-if request.has_key('previous_form_id'):
-  previous_form_id = request.get('previous_form_id')
-  if previous_form_id != '':
-    form_id = previous_form_id
-
-form = getattr(context, form_id)
-field = form.get_field(field_id)
-base_category = field.get_value('base_category')
-relation_setter_id = field.get_value('relation_setter_id')
-if relation_setter_id: relation_setter = getattr(o, relation_setter_id)
-portal_type = map(lambda x:x[0],field.get_value('portal_type'))
-
-if uids != []:
-  if relation_setter_id:
-    # Clear the relation
-    relation_setter((), portal_type=portal_type)
-    # Warning, portal type is at strange value because of form
-    # And update it
-    relation_setter(uids, portal_type=portal_type)
-  else:
-    # Clear the relation
-    o.setValueUids(base_category, (), portal_type=portal_type)
-    # Warning, portal type is at strange value because of form
-    # And update it
-    o.setValueUids(base_category, uids, portal_type=portal_type)
-else:
-  if relation_setter_id:
-    # Clear the relation
-    relation_setter((), portal_type=portal_type)
-  else:    
-    # Clear the relation
-    o.setValueUids(base_category,  (), portal_type=portal_type)
-
-if not selection_index:
-  redirect_url = '%s/%s?%s' % ( o.absolute_url()
-                            , form_id
-                            , 'portal_status_message=Data+Updated.'
-                            )
-else:
-  redirect_url = '%s/%s?selection_index=%s&selection_name=%s&%s' % ( o.absolute_url()
-                            , form_id
-                            , selection_index
-                            , selection_name
-                            , 'portal_status_message=Data+Updated.'
-                            )
-
-
-request[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_validateRelation.py b/product/ERP5/skins/erp5_core/Base_validateRelation.py
deleted file mode 100755
index 891edc3e557dc22605487bae89683ac494d13740..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_validateRelation.py
+++ /dev/null
@@ -1,212 +0,0 @@
-## Script (Python) "Base_validateRelation"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id, selection_index, selection_name, object_uid, object_path
-##title=
-##
-from Products.Formulator.Errors import ValidationError, FormValidationError
-from ZTUtils import make_query
-
-
-
-request=context.REQUEST
-
-# We stop doing this
-#base_category = context.getBaseCategoryId()
-base_category = None
-
-o = context.portal_catalog.getObject(object_uid)
-redirect_url = None
-
-if o is None:
-  # we first try to reindex the object, thanks to the object_path
-  o = context.restrictedTraverse(object_path)
-  if o is not None:
-    o.immediateReindexObject()
-  else:
-    return "Sorrry, Error, the calling object was not catalogued. Do not know how to do ?"
-
-def checkSameKeys(a , b):
-  """
-    Checks if the two lists contain
-    the same values
-  """
-  same = 1
-  for ka in a:
-    if not ka in b:
-      same = 0
-  for kb in b:
-    if not kb in a:
-      same = 0
-  return same
-
-def getOrderedUids(uids, values, catalog_index):
-  value_to_uid = {}
-  for uid in uids:
-    key = context.portal_catalog(uid=uid)[0].getObject().getProperty(catalog_index)
-    value_to_uid[key] = uid
-  uids = []
-  for value in values:
-    uids.append(value_to_uid[value])
-  return uids
-
-  field.get_value('base_category')
-
-try:
-  # Validate the form
-  form = getattr(context,form_id)
-  form.validate_all_to_request(request)
-  my_field = None
-  # XXXXXXXXXXXXXXXXX
-  # we should update data here if we want to be clever
-  # Find out which field defines the relation
-  for f in form.get_fields():
-    if f.has_value( 'base_category'):
-        #if f.get_value('base_category') == base_category:
-        k = f.id
-        v = getattr(request,k,None)
-        if v in (None, '', 'None', [], ()) and context.getProperty(k[3:]) in (None, '', 'None', [], ()):
-          # The old value is None and the new value is not significant
-          # This bug fix is probably temporary since '' means None
-          pass
-        elif v != context.getProperty(k[3:]):
-          old_value = context.getProperty(k[3:])
-          my_field = f
-          new_value = v
-          base_category = f.get_value( 'base_category')
-  if my_field and base_category is not None:
-    empty_list = 0
-    if new_value == '':
-      new_value = []
-    if same_type(new_value,'a'):
-      new_value = [new_value]
-    same_keys = 0
-    if my_field.meta_type == 'MultiRelationStringField':
-      # The checkProperty sometimes does not provide an
-      # acceptable value - XXXX - see vetement_id in Modele View
-      if old_value is '' or old_value is None:
-        old_value = []
-      try:
-        old_value = list(old_value)
-      except:
-        old_value = [old_value]
-      #return str((context.getProperty('vetement_id_list'),my_field.id, new_value, old_value))
-      if checkSameKeys(new_value, old_value):
-        # Reorder keys
-        same_keys = 1
-    portal_type = map(lambda x:x[0],my_field.get_value('portal_type'))
-    # We work with strings - ie. single values
-    kw ={}
-    kw[my_field.get_value('catalog_index')] = new_value
-    context.portal_selections.setSelectionParamsFor('search_relation', kw.copy())
-    kw['base_category'] = base_category
-    kw['portal_type'] = portal_type
-    request.set('base_category', base_category)
-    request.set('portal_type', portal_type)
-    request.set(my_field.get_value('catalog_index'), new_value)
-    request.set('field_id', my_field.id)
-    previous_uids = o.getValueUids(base_category, portal_type=portal_type)
-    relation_list = context.portal_catalog(**kw)
-    relation_uid_list = map(lambda x: x.uid, relation_list)
-    uids = []
-    for uid in previous_uids:
-      if uid in relation_uid_list:
-        uids.append(uid)
-    context.portal_selections.setSelectionCheckedUidsFor('search_relation', uids)
-    if len(new_value) == 0:
-      # Clear the relation
-      o.setValueUids(base_category,  (), portal_type=portal_type)
-    elif same_keys:
-      uids = getOrderedUids(uids, new_value, my_field.get_value('catalog_index'))
-      return o.Base_editRelation( form_id,
-                                my_field.id,
-                                selection_index,
-                                selection_name,
-                                uids,
-                                object_uid,
-                                listbox_uid=None)
-    elif len(relation_list) > 0:
-      # If we have only one in the list, we don't want to lose our time by
-      # selecting it. So we directly do the update
-      if len(relation_list) == 1:
-          selection_index=None
-          uids = [relation_list[0].uid]
-          return o.Base_editRelation( form_id = form_id,
-                                    field_id = my_field.id,
-                                    selection_index = selection_index,
-                                    selection_name = selection_name,
-                                    uids = uids,
-                                    object_uid = object_uid,
-                                    listbox_uid=None)
-      # This is just added when we want to just remove
-      # one item inside a multiRelationField
-      else:
-        if len(relation_uid_list) == len(new_value):
-          complete_value_list = []
-          # We have to find the full value, for example instead of
-          # /foo/ba% we should have /foo/bar
-          for value in new_value:
-            catalog_index = my_field.get_value('catalog_index')
-            kw[catalog_index] = value
-            complete_value = context.portal_catalog(**kw)[0].getObject().getProperty(catalog_index)
-            complete_value_list.append(complete_value)
-          new_value = complete_value_list
-          uids = getOrderedUids(relation_uid_list, new_value, my_field.get_value('catalog_index'))
-          selection_index=None
-          return o.Base_editRelation( form_id = form_id,
-                                    field_id = my_field.id,
-                                    selection_index = selection_index,
-                                    selection_name = selection_name,
-                                    uids = uids,
-                                    object_uid = object_uid,
-                                    listbox_uid=None)
-
-      kw = {}
-      kw['form_id'] = 'search_relation'
-      kw['selection_index'] = selection_index
-      kw['object_uid'] = object_uid
-      kw['field_id'] = my_field.id
-      kw['portal_type'] = portal_type
-      kw['base_category'] = base_category
-      kw['selection_name'] = 'search_relation'
-      kw['cancel_url'] = request.get('HTTP_REFERER')
-      kw['previous_form_id'] = form_id
-      redirect_url = '%s/%s?%s' % ( o.absolute_url()
-                                , 'search_relation'
-                                , make_query(kw)
-                                )
-    else:
-      request.set('catalog_index', my_field.get_value('catalog_index'))
-      if my_field.meta_type == 'MultiRelationStringField':
-        request.set('relation_values', request.get( my_field.id, None))
-      else:
-        request.set('relation_values', [request.get( my_field.id, None)])
-      request.set('default_module', my_field.get_value('default_module'))
-      request.set('portal_type', portal_type[0])
-      return o.Base_viewCreateRelationDialog( REQUEST=request )
-except FormValidationError, validation_errors:
-  # Pack errors into the request
-  field_errors = form.ErrorFields(validation_errors)
-  request.set('field_errors', field_errors)
-  return form(request)
-else:
-  message = 'Relation+Unchanged.'
-
-if redirect_url is None:
-  if not selection_index:
-    redirect_url = '%s/%s?%s' % ( o.absolute_url()
-                              , form_id
-                              , 'portal_status_message=%s' % message
-                              )
-  else:
-    redirect_url = '%s/%s?selection_index=%s&selection_name=%s&%s' % ( o.absolute_url()
-                              , form_id
-                              , selection_index
-                              , selection_name
-                              , 'portal_status_message=%s' % message
-                              )
-
-request[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Base_viewConsistencyRepairReport.pt b/product/ERP5/skins/erp5_core/Base_viewConsistencyRepairReport.pt
deleted file mode 100755
index cbb42cec7f43c72ff7ccd3e17ce939e0d799b98d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_viewConsistencyRepairReport.pt
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-    xml:lang="en"
-    xmlns:tal="http://xml.zope.org/namespaces/tal"
-    xmlns:metal="http://xml.zope.org/namespaces/metal"
-    metal:use-macro="here/view_master/macros/master">
-
-  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-      <title tal:content="template/title_or_id">The title</title>
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Main">
-
-
-<strong>Consistency Repair Report</strong><br><br>
-
-<table border=1>
-  <tr align=center>
-    <td><b>Url</b></td><td><b>Error</b></td><td><b>Severity</b></td><td><b>Message</b></td>
-  </tr>
-  <span tal:repeat="error_item python:here.fixConsistency()">
-
-  <tr>
-    <td>
-      <span tal:replace="python: error_item[0]"/>
-    </td>
-    <td>
-      <span tal:replace="python: error_item[1]"/>
-    </td>
-    <td>
-      <span tal:replace="python: error_item[2]"/>
-    </td>
-    <td>
-      <span tal:replace="python: error_item[3]"/>
-    </td>
-  </tr>
-
-  </span>
-</table>
-
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_core/Base_viewConsistencyReport.pt b/product/ERP5/skins/erp5_core/Base_viewConsistencyReport.pt
deleted file mode 100755
index b558e47c6d9f52ce50b57515fbd7f84cc5f9cd1d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_viewConsistencyReport.pt
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-    xml:lang="en"
-    xmlns:tal="http://xml.zope.org/namespaces/tal"
-    xmlns:metal="http://xml.zope.org/namespaces/metal"
-    metal:use-macro="here/view_master/macros/master">
-
-  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-      <title tal:content="template/title_or_id">The title</title>
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Main">
-
-
-<strong>Consistency Report</strong><br><br>
-
-<table border=1>
-  <tr align=center>
-    <td><b>Url</b></td><td><b>Error</b></td><td><b>Severity</b></td><td><b>Message</b></td>
-  </tr>
-  <span tal:repeat="error_item python:here.checkConsistency()">
-
-  <tr>
-    <td>
-      <span tal:replace="python: error_item[0]"/>
-    </td>
-    <td>
-      <span tal:replace="python: error_item[1]"/>
-    </td>
-    <td>
-      <span tal:replace="python: error_item[2]"/>
-    </td>
-    <td>
-      <span tal:replace="python: error_item[3]"/>
-    </td>
-  </tr>
-
-  </span>
-</table>
-
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_core/Base_viewDict.py b/product/ERP5/skins/erp5_core/Base_viewDict.py
deleted file mode 100755
index 4528d2f77e99df3946ee4a07cbc600f12855a1d7..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_viewDict.py
+++ /dev/null
@@ -1,25 +0,0 @@
-## Script (Python) "Base_viewDict"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-ret = '<html><body><table width=100%>\n'
-
-dict = context.showDict().items()
-dict.sort()
-i = 0
-for k,v in dict:
-  if (i % 2) == 0:
-    c = '#88dddd'
-  else:
-    c = '#dddd88'
-  i += 1
-  ret += '<tr bgcolor="%s"><td >%s</td><td>%s</td></tr>\n' % (c, k, repr(v))
-
-ret += '</table></body></html>\n'
-
-return ret
diff --git a/product/ERP5/skins/erp5_core/Base_viewErrorReport.pt b/product/ERP5/skins/erp5_core/Base_viewErrorReport.pt
deleted file mode 100755
index 6339d9468d28142bfccc5bf1c9511d4e11692a93..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_viewErrorReport.pt
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-    xml:lang="en"
-    xmlns:tal="http://xml.zope.org/namespaces/tal"
-    xmlns:metal="http://xml.zope.org/namespaces/metal"
-    metal:use-macro="here/view_master/macros/master">
-
-  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-      <title tal:content="template/title_or_id">The title</title>
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Main">
-
-
-<strong>Consistency Report</strong><br><br>
-
-<table border=1>
-  <tr align=center>
-    <td><b>Url</b></td><td><b>Error</b></td><td><b>Severity</b></td><td><b>Message</b></td>
-  </tr>
-  <span tal:define="method python:request.get('method_name')"
-        tal:repeat="error_item python:getattr(here,method)(request)">
-
-  <tr>
-    <td>
-      <span tal:replace="python: error_item[0]"/>
-    </td>
-    <td>
-      <span tal:replace="python: error_item[1]"/>
-    </td>
-    <td>
-      <span tal:replace="python: error_item[2]"/>
-    </td>
-    <td>
-      <span tal:replace="python: error_item[3]"/>
-    </td>
-  </tr>
-
-  </span>
-</table>
-
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_core/Base_viewHistory.pt b/product/ERP5/skins/erp5_core/Base_viewHistory.pt
deleted file mode 100755
index fa3918aaf4efe24c812533c47982d4397c403c24..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_viewHistory.pt
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Sebastien Robin     <seb@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-    xml:lang="en"
-    xmlns:tal="http://xml.zope.org/namespaces/tal"
-    xmlns:metal="http://xml.zope.org/namespaces/metal"
-    metal:use-macro="here/view_master/macros/master">
-
-  <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-      <title tal:content="template/title_or_id">The title</title>
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Main">
-
-<br>
-<table>
-  <span tal:repeat="workflow_id python:here.getWorkflowIds()">
-  <span tal:define="global list_history_item python:here.portal_workflow.getInfoFor(ob=here, name='history', wf_id=workflow_id)"
-        tal:on-error="nothing"/>
-
-
-  <span tal:condition="python: here.portal_workflow.getInfoFor(ob=here, name='history', wf_id=workflow_id) is not () and here.portal_workflow.getInfoFor(ob=here, name='history', wf_id=workflow_id) is not None"
-      tal:on-error="nothing">
-  <tr>
-  <td>
-  <b tal:content="workflow_id"/><br/>
-  </td>
-  </tr>
-
-  <tr><td>
-  <table border="1">
-
-  <tr align=center>
-    <span tal:repeat="history_element_title python:list_history_item[-1].keys()"
-          tal:on-error="nothing">
-    <span tal:condition="python: history_element_title<>'history'">
-    <td>
-      <b><span tal:content="python: history_element_title"/></b>
-    </td>
-    </span>
-    </span>
-  </tr>
-
-  <tr tal:repeat="history_item list_history_item"
-        tal:on-error="nothing">
-    <span tal:repeat="history_element_title python:list_history_item[-1].keys()">
-    <span tal:condition="python: history_element_title<>'history'">
-    <td>
-      <span tal:content="python: history_item.get(history_element_title)"/>
-    </td>
-    </span>
-    </span>
-  </tr>
-
-  </table>
-  </td></tr>
-  </span>
-  </span>
-</table>
-
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_core/Base_viewMetadata.form b/product/ERP5/skins/erp5_core/Base_viewMetadata.form
deleted file mode 100755
index c8571ca9d2eb3f90b47a1154cd220b56f334ad6b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_viewMetadata.form
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Metadata</title>
-  <row_length>4</row_length>
-  <name>metadata_edit</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_language</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Language</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_effective_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Effective date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_expiration_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Expiration Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_format</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Format</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_rights</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Rights</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_category_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">8</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Categories</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>here/getCategoryList</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_contributors_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Contributors</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_related_object_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">20</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Related Objects</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">80</width>
-        </values>
-        <tales>
-          <default>python: map(lambda x: x.getPath(), here.portal_categories.getRelatedValueList(here))</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/Base_viewRelatedObjectList.form b/product/ERP5/skins/erp5_core/Base_viewRelatedObjectList.form
deleted file mode 100755
index 770ee788cf859fed50ee0fb59d1e42406ef8cb09..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_viewRelatedObjectList.form
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Update Relation</title>
-  <row_length>4</row_length>
-  <name>Update Relation</name>
-  <pt>form_list_relation</pt>
-  <action>Base_updateRelation</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[('id', 'id'), ('portal_type', 'Portal Type'), ('Title', 'Title'), ('Description', 'Description')]</all_columns>
-          <all_editable_columns></all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('portal_type', 'Portal Type'), ('Title', 'Title'), ('Description', 'Description')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('portal_type', "''"), ('Title', "''"), ('Description', "''")]</default_params>
-          <description></description>
-          <domain_root_list></domain_root_list>
-          <domain_tree></domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns></editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes></global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action></list_action>
-          <list_cookie>SEARCH_LIST</list_cookie>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list></report_root_list>
-          <report_tree></report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">1</select>
-          <selection_name>Base_viewRelatedObjectList</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Search Results</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/Base_viewUIDialog.form b/product/ERP5/skins/erp5_core/Base_viewUIDialog.form
deleted file mode 100755
index 9a132013b96753583b0103c237276b82abf0820a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_viewUIDialog.form
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Set List Settting</title>
-  <row_length>4</row_length>
-  <name>Base_viewUIDialog</name>
-  <pt>form_list_ui</pt>
-  <action>Base_configureUI</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>columns</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('None', 'None'), ('Id', 'id'), ('Title', 'Title'), ('Description', 'Description')]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>columns</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>lines</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('5', '5'), ('10', '10'), ('25', '25'), ('50', '50'), ('100', '100'), ('200', '200'), ('500', '500')]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Line</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/Base_zSearchRelatedObjectsByCategory.zsql b/product/ERP5/skins/erp5_core/Base_zSearchRelatedObjectsByCategory.zsql
deleted file mode 100755
index 09067034275bcdb15f501ec96281726f4838bb60..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_zSearchRelatedObjectsByCategory.zsql
+++ /dev/null
@@ -1,17 +0,0 @@
-<dtml-comment>
-title:Search Category
-connection_id:erp5_sql_connection
-max_rows:10000
-max_cache:100
-cache_time:0
-class_name:ZSQLBrain
-class_file:zsqlbrain.py
-</dtml-comment>
-<params>category_uid</params>
-SELECT DISTINCT
-  catalog.uid, catalog.path
-FROM
-  catalog, category
-WHERE
-  catalog.uid = category.uid
-AND  category.category_uid = <dtml-sqlvar category_uid type="int">
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.zsql b/product/ERP5/skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.zsql
deleted file mode 100755
index b77eb42f5160485408e930672b8c48bbe39f21b9..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Base_zSearchRelatedObjectsByCategoryList.zsql
+++ /dev/null
@@ -1,24 +0,0 @@
-<dtml-comment>
-title:Search Category
-connection_id:erp5_sql_connection
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:ZSQLBrain
-class_file:zsqlbrain.py
-</dtml-comment>
-<params>category_list
-portal_type</params>
-<dtml-if portal_type>
-SELECT DISTINCT catalog.uid, catalog.path, catalog.relative_url, portal_type
-FROM catalog, category
-WHERE (<dtml-in portal_type><dtml-unless sequence-start> OR </dtml-unless>catalog.portal_type='<dtml-var sequence-item>'</dtml-in>)
-AND catalog.uid = category.uid
-AND (<dtml-var "portal_categories.buildSQLSelector(category_list)">)
-<dtml-else>
-SELECT DISTINCT catalog.uid, catalog.path, portal_type
-FROM catalog, category
-WHERE catalog.uid = category.uid
-AND (<dtml-var "portal_categories.buildSQLSelector(category_list)">)
-</dtml-if>
-
diff --git a/product/ERP5/skins/erp5_core/BusinessTemplate_build.py b/product/ERP5/skins/erp5_core/BusinessTemplate_build.py
deleted file mode 100755
index c2e4ea3a8bb2b27c7bf8fa44077756b90a791d47..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/BusinessTemplate_build.py
+++ /dev/null
@@ -1,17 +0,0 @@
-## Script (Python) "BusinessTemplate_build"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id=''
-##title=Build a business template
-##
-REQUEST=context.REQUEST
-
-context.build()
-
-ret_url = context.absolute_url() + '/' + form_id
-qs = '?portal_status_message=Built.'
-
-return REQUEST.RESPONSE.redirect( ret_url + qs )
diff --git a/product/ERP5/skins/erp5_core/BusinessTemplate_export.py b/product/ERP5/skins/erp5_core/BusinessTemplate_export.py
deleted file mode 100755
index 8801c10803bd580edc9990913140aba726b3a70f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/BusinessTemplate_export.py
+++ /dev/null
@@ -1,17 +0,0 @@
-## Script (Python) "BusinessTemplate_export"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id='', toxml=0
-##title=Export a business template
-##
-REQUEST=context.REQUEST
-RESPONSE=REQUEST.RESPONSE
-
-context.build()
-s = context.portal_templates.manage_exportObject(id=context.getId(), toxml=toxml, Base_download=1,
-                                                 REQUEST=REQUEST, RESPONSE=RESPONSE)
-
-return s
diff --git a/product/ERP5/skins/erp5_core/BusinessTemplate_install.py b/product/ERP5/skins/erp5_core/BusinessTemplate_install.py
deleted file mode 100755
index c31d7ae7d88dfbe52b5e5afda6a23b4b3d44a7ec..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/BusinessTemplate_install.py
+++ /dev/null
@@ -1,17 +0,0 @@
-## Script (Python) "BusinessTemplate_install"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id=''
-##title=Build a business template
-##
-REQUEST=context.REQUEST
-
-context.install()
-
-ret_url = context.absolute_url() + '/' + form_id
-qs = '?portal_status_message=Installed.'
-
-return REQUEST.RESPONSE.redirect( ret_url + qs )
diff --git a/product/ERP5/skins/erp5_core/BusinessTemplate_save.py b/product/ERP5/skins/erp5_core/BusinessTemplate_save.py
deleted file mode 100755
index cbf240c6c156af4a92a052550d829a340110ec8f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/BusinessTemplate_save.py
+++ /dev/null
@@ -1,17 +0,0 @@
-## Script (Python) "BusinessTemplate_save"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id='', toxml=0
-##title=Save a business template
-##
-REQUEST=context.REQUEST
-
-f = context.portal_templates.save(context, toxml=toxml)
-
-ret_url = context.absolute_url() + '/' + form_id
-qs = '?portal_status_message=Saved+in+%s+.' % f
-
-return REQUEST.RESPONSE.redirect( ret_url + qs )
diff --git a/product/ERP5/skins/erp5_core/BusinessTemplate_view.form b/product/ERP5/skins/erp5_core/BusinessTemplate_view.form
deleted file mode 100755
index bde56733aa5e041eb1d3306e2662f7d0ab28c29b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/BusinessTemplate_view.form
+++ /dev/null
@@ -1,623 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Business Template Definition</title>
-  <row_length>4</row_length>
-  <name>BusinessTemplate_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype>multipart/form-data</enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">8</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_base_category_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Base Categories</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_workflow_id_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Workflows</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_template_portal_type_id_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Portal Types</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_action_path_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Menus</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_skin_id_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Skins</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_module_id_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Modules</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_template_path_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">10</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Path List</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">80</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_catalog_method_id_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Catalog Methods</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_catalog_result_table_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Catalog Result Tables</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_catalog_result_key_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Catalog Result Keys</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_role_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Roles</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_site_property_id_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Site Properties</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_document_class_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Document Classes</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_property_sheet_id_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Propertysheets</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_template_product_id_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Products</title>
-          <unicode type="int">0</unicode>
-          <view_separator>
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/Category_viewEditDialog.pt b/product/ERP5/skins/erp5_core/Category_viewEditDialog.pt
deleted file mode 100755
index e112f6367240ed2eb99db0891accc0cf419e2805..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Category_viewEditDialog.pt
+++ /dev/null
@@ -1,47 +0,0 @@
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
-<body>
-<div metal:fill-slot="main">	  
-<div class="Desktop">
-<h2>Edit: <span tal:replace="here/getId">My ID</span></h2>
- 
-<form action="folder_edit" method="post">
-<table class="FormLayout">
- 
- <tr valign="top">
-  <th align="right"> Title
-  </th>
-  <td colspan="3">
-   <input type="text"
-          name="title"
-          value=""
-		  tal:attributes="value here/title"
-          size="65">
-  </td>
-  
- <tr valign="top">
-  <th align="right"> Description
-  </th>
-  <td colspan="3">
-   <textarea name="description:text" rows="5"
-             cols="65" wrap="soft"
-			 tal:content="here/description">
-   </textarea>
-  </td>
- </tr>
-
- <tr valign="top">
-  <td> <br> </td>
-  <td>
-   <input type="submit" name="choice" value=" Change ">
-   <input type="submit" name="choice" value=" Change and View ">
-  </td>
- </tr>
- 
-</table>
-</form>
-</div>
-</div>
-</body>
-</html>
diff --git a/product/ERP5/skins/erp5_core/Delivery_mergeDeliveryList.py b/product/ERP5/skins/erp5_core/Delivery_mergeDeliveryList.py
deleted file mode 100755
index 87bcbd5d68777bf3f0e1b61d69c9237dc9bc2e9b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Delivery_mergeDeliveryList.py
+++ /dev/null
@@ -1,25 +0,0 @@
-## Script (Python) "Delivery_mergeDeliveryList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id=''
-##title=Merge deliveries into one
-##
-REQUEST=context.REQUEST
-selection_name = REQUEST['selection_name']
-object_list = context.portal_selections.getSelectionValueList(selection_name, context=context, REQUEST=REQUEST)
-delivery_list = []
-for o in object_list:
-  delivery_list.append(o)
-
-if len(delivery_list) < 2:
-  ret_url = context.absolute_url() + '/' + form_id
-  qs = '?portal_status_message=Please+select+more+than+one+items.'
-else:
-  ret_url = context.absolute_url() + '/' + form_id
-  qs = '?portal_status_message=Merged.'
-  context.portal_simulation.mergeDeliveryList(delivery_list)
-
-return REQUEST.RESPONSE.redirect( ret_url + qs )
diff --git a/product/ERP5/skins/erp5_core/Delivery_viewMergedDeliveryList.form b/product/ERP5/skins/erp5_core/Delivery_viewMergedDeliveryList.form
deleted file mode 100755
index f957c23f72ddf36d6a7bdda141e666a238c04c64..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Delivery_viewMergedDeliveryList.form
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Merge the deliveries</title>
-  <row_length>4</row_length>
-  <name>Delivery_viewMergedDeliveryList</name>
-  <pt>form_view_dialog</pt>
-  <action>Delivery_mergeDeliveryList</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[('id', 'R\xe9f\xe9rence'), ('portal_type', 'Type'), ('Title', 'Titre'), ('relative_url', "Chemin d'acc\xe8s"), ('Description', 'Description')]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'R\xe9f\xe9rence'), ('portal_type', 'Type'), ('Title', 'Titre'), ('relative_url', "Chemin d'acc\xe8s"), ('Description', 'Description')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('relative_url', "''"), ('portal_type', "''"), ('Description', "''")]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method></list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name></selection_name>
-          <sort type="list">[('relative_url', 'relative_url')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Merged deliveries</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-          <list_method>python:None</list_method>
-          <selection_name>here/REQUEST/form/selection_name</selection_name>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/ERP5Site_exportAll.py b/product/ERP5/skins/erp5_core/ERP5Site_exportAll.py
deleted file mode 100755
index 8793b5f8e5fbb63bf5c21763891bf820609a76a7..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/ERP5Site_exportAll.py
+++ /dev/null
@@ -1,24 +0,0 @@
-## Script (Python) "ERP5Site_exportAll"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-for folder in context.objectValues(("ERP5 Folder",)):
-  print "#### Exporting the folder %s ####" % folder.id
-  folder.exportAll(dir='/var/lib/zope/')
-
-print "#### Exporting the folder %s ####" % 'portal_catalog'
-context.manage_exportObject(id='portal_catalog')
-
-print "#### Exporting the folder %s ####" % 'portal_categories'
-context.manage_exportObject(id='portal_categories')
-
-print "#### Exporting the folder %s ####" % 'portal_types'
-context.manage_exportObject(id='portal_types')
-
-print "work done"
-return printed
diff --git a/product/ERP5/skins/erp5_core/ERP5Site_getModuleItemList.py b/product/ERP5/skins/erp5_core/ERP5Site_getModuleItemList.py
deleted file mode 100755
index c6085a0d3af9e5b1f635b586c5d0affb6e177ba5..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/ERP5Site_getModuleItemList.py
+++ /dev/null
@@ -1,38 +0,0 @@
-## Script (Python) "ERP5Site_getModuleItemList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-from Products.ERP5Type.Cache import CachingMethod
-
-try:
-  user = context.portal_membership.getAuthenticatedMember().getUserName()
-except:
-  user = None
-
-def getModuleItemList(user=None):
-  translate = context.translation_service.translate
-
-  item_list = []
-  try:
-    for module in context.getPortalObject().objectValues('ERP5 Folder'):
-      try:
-        url = module.absolute_url()
-        label = module.getTitle() or module.getId()
-        label = translate('ui', label)
-        item_list.append((url, label))
-      except:
-        pass
-  except:
-    pass
-
-  def compareModules(a, b): return cmp(a[1], b[1])
-  item_list.sort(compareModules)
-  return item_list
-
-getModuleItemList = CachingMethod(getModuleItemList, id='ERP5Site_getModuleItemList')
-return getModuleItemList(user=user)
diff --git a/product/ERP5/skins/erp5_core/ERP5Site_getObjectPathListAsText.py b/product/ERP5/skins/erp5_core/ERP5Site_getObjectPathListAsText.py
deleted file mode 100755
index 32da1e951fb268e6577ae8bb3e1494da9d17ff74..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/ERP5Site_getObjectPathListAsText.py
+++ /dev/null
@@ -1,25 +0,0 @@
-## Script (Python) "ERP5Site_getObjectPathListAsText"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-site = context.portal_url.getPortalObject()
-object_list = []
-for o in site.objectValues():
-  if hasattr(o,'getMetaType'):
-    if o.getMetaType()=='ERP5 Folder':
-      path = o.getPhysicalPath()
-      object_ids = o.objectIds()
-      for id in object_ids:
-        object_list += [path + (id,)]
-path = site.portal_simulation.getPhysicalPath()
-for id in site.portal_simulation.objectIds():
-  object_list += [path + (id,)]
-object_list.sort()
-for path in object_list:
-  print '/'.join(path)
-return printed
diff --git a/product/ERP5/skins/erp5_core/ERP5Site_reindexAll.py b/product/ERP5/skins/erp5_core/ERP5Site_reindexAll.py
deleted file mode 100755
index b72d8439a6d1771d81362f3b37df03fa79cf565a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/ERP5Site_reindexAll.py
+++ /dev/null
@@ -1,42 +0,0 @@
-## Script (Python) "ERP5Site_reindexAll"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-print "#### Indexing categories ####"
-for o in list(context.portal_categories.objectValues()):
-  o.activate(passive_commit=1).recursiveImmediateReindexObject()
-
-# We index simulation first to make sure we can calculate tests (ie. related quantity)
-print "#### Indexing simulation ####"
-for o in list(context.portal_simulation.objectValues()):
-  o.activate(passive_commit=1).immediateReindexObject()
-
-# We index templates secondly
-print "#### Indexing templates ####"
-for o in list(context.portal_templates.objectValues()):
-  o.activate(passive_commit=1).immediateReindexObject()
-
-# Then we index everything except inventories
-for folder in context.portal_url.getPortalObject().objectValues(("ERP5 Folder",)):
-  print "#### Indexing contents inside folder %s ####" % folder.id
-  if folder.getId() not in ('inventaire_mp','inventaire_pf'):
-    for o in list(folder.objectValues()):
-      try:
-        o.activate(passive_commit=1).recursiveImmediateReindexObject()
-      except:
-        #raise RuntimeError, o.getRelativeUrl()
-        raise RuntimeError, 'error: folder=%s, o=%s'  % (repr(folder.getId()), repr(o))
-
-# Then we index inventories
-for folder in context.portal_url.getPortalObject().objectValues(("ERP5 Folder",)):
-  print "#### Indexing contents inside folder %s ####" % folder.id
-  if folder.getId() in ('inventaire_mp','inventaire_pf'):
-    for o in list(folder.objectValues()):
-      o.activate(passive_commit=1).recursiveImmediateReindexObject()
-
-return printed
diff --git a/product/ERP5/skins/erp5_core/ERP5Site_reindexCategory.py b/product/ERP5/skins/erp5_core/ERP5Site_reindexCategory.py
deleted file mode 100755
index cdc8fa77aaf7b4db5efca76c42227cd315a989f2..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/ERP5Site_reindexCategory.py
+++ /dev/null
@@ -1,41 +0,0 @@
-## Script (Python) "ERP5Site_reindexCategory"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=request=None
-##title=
-##
-error_list = []
-return_list = []
-
-for category in context.portal_categories.objectValues():
-  #print "#### Indexing inside the folder %s ####" % 'portal_categories'
-  error_list += context.reindexAll(object=category,request=context)
-
-nb_types = {}
-
-for error in error_list:
-  # We count the number of each portal type
-  if error[1]=='portal_type':
-    type = error[3]
-    if nb_types.has_key(type):
-      nb_types[type] = nb_types[type] + 1
-    else:
-      nb_types[type] = 1
-  else: 
-    #print error
-    return_list.append(error)
-
-for type in nb_types.keys():
-  # Find the number of each portal type in the catalog
-  count_result = context.portal_catalog.countResults(portal_type=type)
-  nb_catalog = count_result[0][0]
-  if nb_types[type] != nb_catalog:
-    message = "XXX Warning for %s: there is %i lines in the catalog instead of %i" % \
-      (type,nb_catalog,nb_types[type])
-    return_list.append(('Count Error', 'PortalRoot_reindexAll',1,message))
-  #else: print "%s: %i" % (type,nb_types[type])
-
-return return_list
diff --git a/product/ERP5/skins/erp5_core/ERP5Site_reindexSimulation.py b/product/ERP5/skins/erp5_core/ERP5Site_reindexSimulation.py
deleted file mode 100755
index 64570105245d2f19ec0450c6b3e6e844d3f8157f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/ERP5Site_reindexSimulation.py
+++ /dev/null
@@ -1,46 +0,0 @@
-## Script (Python) "ERP5Site_reindexSimulation"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=request=None
-##title=
-##
-error_list = []
-return_list = []
-
-for object in context.portal_simulation.objectValues():
-  # Reexpand to propagate new rules
-  object.expand()
-
-for object in context.portal_simulation.objectValues():
-  #print "#### Indexing inside the folder %s ####" % 'portal_simulation'
-  # Reindex
-  error_list += context.reindexAll(object=object,request=context)
-
-nb_types = {}
-
-for error in error_list:
-  # We count the number of each portal type
-  if error[1]=='portal_type':
-    type = error[3]
-    if nb_types.has_key(type):
-      nb_types[type] = nb_types[type] + 1
-    else:
-      nb_types[type] = 1
-  else:
-    #print error
-    return_list.append(error)
-
-for type in nb_types.keys():
-  # Find the number of each portal type in the catalog
-  count_result = context.portal_catalog.countResults(portal_type=type)
-  nb_catalog = count_result[0][0]
-  if nb_types[type] != nb_catalog:
-    message = "XXX Warning for %s: there is %i lines in the catalog instead of %i" % \
-      (type,nb_catalog,nb_types[type])
-    return_list.append(('Count Error', 'PortalRoot_reindexAll',1,message))
-  #else: print "%s: %i" % (type,nb_types[type])
-
-return return_list
diff --git a/product/ERP5/skins/erp5_core/Folder_copy.py b/product/ERP5/skins/erp5_core/Folder_copy.py
deleted file mode 100755
index 18a00ea543466bd65a3c8de92a67cf20c986cd72..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_copy.py
+++ /dev/null
@@ -1,27 +0,0 @@
-## Script (Python) "Folder_copy"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id, uids=[], listbox_uid=[],selection_name=''
-##title=
-##
-selected_uids = context.portal_selections.updateSelectionCheckedUidList(selection_name,listbox_uid,uids)
-uids = context.portal_selections.getSelectionCheckedUidsFor(selection_name)
-# make sure nothing is checked after
-context.portal_selections.setSelectionCheckedUidsFor(selection_name, [])
-
-
-REQUEST=context.REQUEST
-# Do we still needs ids ???
-#if REQUEST.has_key('ids'):
-#  context.manage_copyObjects(ids=REQUEST['ids'], REQUEST=REQUEST, RESPONSE=REQUEST.RESPONSE)
-#  return REQUEST.RESPONSE.redirect(context.absolute_url() + '/' + form_id + '?portal_status_message=Item(s)+Copied.')
-#elif REQUEST.has_key('uids'):
-if uids != []:
-  #context.manage_copyObjects(uids=REQUEST['uids'], REQUEST=REQUEST, RESPONSE=REQUEST.RESPONSE)
-  context.manage_copyObjects(uids=uids, REQUEST=REQUEST, RESPONSE=REQUEST.RESPONSE)
-  return REQUEST.RESPONSE.redirect(context.absolute_url() + '/' + form_id + '?portal_status_message=Item(s)+Copied.')
-else:
-  return REQUEST.RESPONSE.redirect(context.absolute_url() + '/' + form_id + '?portal_status_message=Please+select+one+or+more+items+to+copy+first.')
diff --git a/product/ERP5/skins/erp5_core/Folder_create.py b/product/ERP5/skins/erp5_core/Folder_create.py
deleted file mode 100755
index ae83389f52b8a4d6551b09408cc2b2066ca1e578..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_create.py
+++ /dev/null
@@ -1,28 +0,0 @@
-## Script (Python) "Folder_create"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-REQUEST=context.REQUEST
-content_types = context.allowedContentTypes()
-
-# Add an object of the same type as the container 
-# or if allowed content types is 1 add that type
-
-if len(content_types) == 1:
-  type_name = content_types[0].id
-else:
-  type_name = context.portal_type
-
-new_id = context.generateNewId()
-context.portal_types.constructContent(type_name=type_name,
-                        container=context,
-                        id=str(new_id),
-                        RESPONSE=REQUEST.RESPONSE)
-#context[new_id].flushActivity(invoke=1)
-
-return REQUEST.RESPONSE
diff --git a/product/ERP5/skins/erp5_core/Folder_cut.py b/product/ERP5/skins/erp5_core/Folder_cut.py
deleted file mode 100755
index 8f76ded524088e49b569fa12a4b4f89f897e5a58..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_cut.py
+++ /dev/null
@@ -1,27 +0,0 @@
-## Script (Python) "Folder_cut"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id,selection_name='',uids=[],listbox_uid=[]
-##title=Cut objects from a folder and copy to the clipboard
-##
-selected_uids = context.portal_selections.updateSelectionCheckedUidList(selection_name,listbox_uid,uids)
-uids = context.portal_selections.getSelectionCheckedUidsFor(selection_name)
-# make sure nothing is checked after
-context.portal_selections.setSelectionCheckedUidsFor(selection_name, [])
-
-
-REQUEST=context.REQUEST
-# do we still need ids ? XXX finish the work here
-#if REQUEST.has_key('ids'):
-#  context.manage_cutObjects(REQUEST['ids'], REQUEST)
-#  return REQUEST.RESPONSE.redirect(context.absolute_url() + '/' + form_id + '/Folder_viewContentList?portal_status_message=Item(s)+Cut.')
-#elif REQUEST.has_key('uids'):
-if uids != []:
-  #context.manage_cutObjects(uids=REQUEST['uids'], REQUEST=REQUEST)
-  context.manage_cutObjects(uids=uids, REQUEST=REQUEST)
-  return REQUEST.RESPONSE.redirect(context.absolute_url() + '/' + form_id + '?portal_status_message=Item(s)+Cut.')
-else:
-  return REQUEST.RESPONSE.redirect(context.absolute_url() + '/Folder_viewContentList?portal_status_message=Please+select+one+or+more+items+to+cut+first.')
diff --git a/product/ERP5/skins/erp5_core/Folder_delete.py b/product/ERP5/skins/erp5_core/Folder_delete.py
deleted file mode 100755
index defde7c5059b08d727f02edf73bc525d7250b559..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_delete.py
+++ /dev/null
@@ -1,31 +0,0 @@
-## Script (Python) "Folder_delete"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id='',selection_index=None,object_uid=None,selection_name=None,field_id=None,uids=None,cancel_url='',listbox_uid=[],md5_object_uid_list=''
-##title=Delete objects from a folder
-##
-selected_uids = context.portal_selections.updateSelectionCheckedUidList(selection_name,listbox_uid,uids)
-uids = context.portal_selections.getSelectionCheckedUidsFor(selection_name)
-
-error = context.portal_selections.selectionHasChanged(md5_object_uid_list,uids)
-
-#return uids
-
-REQUEST=context.REQUEST
-#REQUEST.set('uids',uids)
-qs = ''
-ret_url = ''
-
-ret_url = context.absolute_url() + '/' + form_id
-if error:
-  qs = '?portal_status_message=Sorry+your+selection+has+changed'
-elif uids is not None:
-  context.manage_delObjects(uids=uids, REQUEST=REQUEST)
-  qs = '?portal_status_message=Deleted.'
-else:
-  qs = '?portal_status_message=Please+select+one+or+more+items+first.'
-
-return REQUEST.RESPONSE.redirect( ret_url + qs )
diff --git a/product/ERP5/skins/erp5_core/Folder_deleteObjectList.py b/product/ERP5/skins/erp5_core/Folder_deleteObjectList.py
deleted file mode 100755
index cf73aef25db856036e6510352c2b59ea9bf1791b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_deleteObjectList.py
+++ /dev/null
@@ -1,16 +0,0 @@
-## Script (Python) "Folder_deleteObjectList"
-##title=Delete objects from a folder
-##parameters=selection_index=None,form_id='',uids=[], listbox_uid=[],selection_name=''
-
-request=context.REQUEST
-
-selected_uids = context.portal_selections.updateSelectionCheckedUidList(selection_name,listbox_uid,uids)
-uids = context.portal_selections.getSelectionCheckedUidsFor(selection_name)
-
-
-kw = {'uid': uids}
-request.set('object_uid', context.getUid())
-request.set('uids', uids)
-context.portal_selections.setSelectionParamsFor('folder_delete_selection', kw)
-return context.Folder_viewDeleteDialog(uids=uids, REQUEST=request)
-
diff --git a/product/ERP5/skins/erp5_core/Folder_filter.py b/product/ERP5/skins/erp5_core/Folder_filter.py
deleted file mode 100755
index dfbf156e2aa2fc574460e0578f6dc73d7939af02..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_filter.py
+++ /dev/null
@@ -1,29 +0,0 @@
-## Script (Python) "Folder_filter"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=selection_name, uids=[], listbox_uid=[]
-##title=
-##
-request = context.REQUEST
-
-# Set selection to currently checked items, taking into consideration changes in uids
-selection_uids = context.portal_selections.getSelectionCheckedUidsFor(selection_name, REQUEST=request)
-filtered_uid_dict = {}
-listbox_uid = map(lambda x:int(x), listbox_uid)
-uids = map (lambda x:int(x), uids)
-for uid in uids:
-   filtered_uid_dict[uid] = 1
-for uid in selection_uids:
-  if uid in listbox_uid:
-    if uid in uids:
-      filtered_uid_dict[uid] = 1
-  else:
-    filtered_uid_dict[uid] = 1
-context.portal_selections.checkAll(selection_name, uids, REQUEST=None)
-context.portal_selections.setSelectionToIds(selection_name, filtered_uid_dict.keys(), REQUEST=request)
-url = context.portal_selections.getSelectionListUrlFor(selection_name, REQUEST=request)
-
-request.RESPONSE.redirect(url)
diff --git a/product/ERP5/skins/erp5_core/Folder_paste.py b/product/ERP5/skins/erp5_core/Folder_paste.py
deleted file mode 100755
index 4867aa97ffd154fb205dd841a2b6b021671966a0..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_paste.py
+++ /dev/null
@@ -1,31 +0,0 @@
-## Script (Python) "Folder_paste"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id
-##title=Paste objects to a folder from the clipboard
-##
-REQUEST=context.REQUEST
-error_message = ''
-if context.cb_dataValid:
-  # We first look if the content of objects to paste is allowed
-  # inside this folder
-  object_list = context.cb_dataItems()
-  portal_type_list = map(lambda x: x.getPortalType(),object_list)
-  allowed_type_list = map(lambda x: x.id, context.allowedContentTypes())
-  for portal_type in portal_type_list:
-    if portal_type not in allowed_type_list:
-      error_message = 'Sorry+you+can+not+paste+theses+Items+here'
-if context.cb_dataValid and error_message=='':
-  new_item_list = context.manage_pasteObjects(REQUEST['__cp'])
-  new_id_list = map(lambda i: i['new_id'],new_item_list)
-  for my_id in new_id_list:
-    context[my_id].flushActivity(invoke=0, method_id='immediateReindexObject')
-    context[my_id].recursiveImmediateReindexObject()
-  return REQUEST.RESPONSE.redirect(context.absolute_url() + '/' + form_id + '?portal_status_message=Item(s)+Pasted.')
-elif context.cb_dataValid and error_message!='':
-  return REQUEST.RESPONSE.redirect(context.absolute_url() + '/' + form_id + '?portal_status_message=%s' % error_message)
-else:
-  return REQUEST.RESPONSE.redirect(context.absolute_url() + '/' + form_id + '?portal_status_message=Copy+or+cut+one+or+more+items+to+paste+first.')
diff --git a/product/ERP5/skins/erp5_core/Folder_print.py b/product/ERP5/skins/erp5_core/Folder_print.py
deleted file mode 100755
index 8d0d03b56d774f336ad691e904cf1c7fb06f4fbc..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_print.py
+++ /dev/null
@@ -1,18 +0,0 @@
-## Script (Python) "Folder_print"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=selection_name='',form_id='',uids=[],listbox_uid=[]
-##title=
-##
-request = context.REQUEST
-
-list_actions = context.portal_actions.listFilteredActionsFor(context)
-print_actions = list_actions['object_print']
-url = print_actions[0]['url']
-
-context.portal_selections.updateSelectionCheckedUidList(selection_name,listbox_uid,uids)
-url += '?selection_name=%s&dialog_category=%s&form_id=%s' % (selection_name , 'object_print', form_id) 
-request.RESPONSE.redirect(url)
diff --git a/product/ERP5/skins/erp5_core/Folder_reindexAll.py b/product/ERP5/skins/erp5_core/Folder_reindexAll.py
deleted file mode 100755
index 83c1df132a3242c31b64c52e824fba52ea5175cc..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_reindexAll.py
+++ /dev/null
@@ -1,39 +0,0 @@
-## Script (Python) "Folder_reindexAll"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=request=None
-##title=
-##
-error_list = []
-return_list = []
-
-#for object in context.objectValues():
-error_list += context.reindexAll(object=context,request=context)
-
-nb_types = {}
-
-for error in error_list:
-  # We count the number of each portal type
-  if error[1]=='portal_type':
-    type = error[3]
-    if nb_types.has_key(type):
-      nb_types[type] = nb_types[type] + 1
-    else:
-      nb_types[type] = 1
-  else: 
-    #print error
-    return_list.append(error)
-
-for type in nb_types.keys():
-  # Find the number of each portal type in the catalog
-  count_result = context.portal_catalog.countResults(portal_type=type)
-  nb_catalog = count_result[0][0]
-  if nb_types[type] != nb_catalog:
-    message = "XXX Warning for %s: there is %i lines in the catalog instead of %i" % \
-      (type,nb_catalog,nb_types[type])
-    return_list.append(('Count Error', 'PortalRoot_reindexAll',1,message))
-
-return return_list
diff --git a/product/ERP5/skins/erp5_core/Folder_search.py b/product/ERP5/skins/erp5_core/Folder_search.py
deleted file mode 100755
index 86b2ceff4bd662c03e873236a3ff0cd8e95be48d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_search.py
+++ /dev/null
@@ -1,11 +0,0 @@
-## Script (Python) "Folder_search"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id=''
-##title=Paste objects to a folder from the clipboard
-##
-REQUEST=context.REQUEST
-return getattr(context,form_id)(REQUEST)
diff --git a/product/ERP5/skins/erp5_core/Folder_show.py b/product/ERP5/skins/erp5_core/Folder_show.py
deleted file mode 100755
index 91002901eca82ae114f34c6a290efa2537d3b0df..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_show.py
+++ /dev/null
@@ -1,14 +0,0 @@
-## Script (Python) "Folder_show"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=selection_name
-##title=
-##
-request = context.REQUEST
-context.portal_selections.setSelectionToAll(selection_name, REQUEST=request)
-url = context.portal_selections.getSelectionListUrlFor(selection_name, REQUEST=request)
-
-request.RESPONSE.redirect(url)
diff --git a/product/ERP5/skins/erp5_core/Folder_viewContentList.form b/product/ERP5/skins/erp5_core/Folder_viewContentList.form
deleted file mode 100755
index 6f396c9f3abd7df79bf2294b21f9672ea99e7a90..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_viewContentList.form
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Folder Contents</title>
-  <row_length>4</row_length>
-  <name>Folder_viewContentList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('Title', 'Title'), ('Description', 'Description')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('Title', "''"), ('Description', "''")]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_cookie>FOLDER_LIST</list_cookie>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>folder_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Contents</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/Folder_viewDeleteDialog.form b/product/ERP5/skins/erp5_core/Folder_viewDeleteDialog.form
deleted file mode 100755
index 40491b41e3a990b1ffaef69dce155de015c9cfc0..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_viewDeleteDialog.form
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Delete the objects</title>
-  <row_length>4</row_length>
-  <name>Folder_viewDeleteDialog</name>
-  <pt>form_folder_delete</pt>
-  <action>Folder_delete</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[('id', 'Reference'), ('portal_type', 'Type'), ('Title', 'Title'), ('relative_url', 'Access Path'), ('Description', 'Description')]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Reference'), ('portal_type', 'Type'), ('Title', 'Title'), ('relative_url', 'Access Path'), ('Description', 'Description')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('relative_url', "''"), ('portal_type', "''"), ('Description', "''")]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_cookie>SEARCH_LIST</list_cookie>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">0</select>
-          <selection_name>folder_delete_selection</selection_name>
-          <sort type="list">[('relative_url', 'relative_url')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Results</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/Folder_viewObjectList.form b/product/ERP5/skins/erp5_core/Folder_viewObjectList.form
deleted file mode 100755
index d4f46d719bb58d93c4c59e744dea915f5945eb15..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_viewObjectList.form
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Folder Contents</title>
-  <row_length>4</row_length>
-  <name>Folder_viewContentList</name>
-  <pt>form_list</pt>
-  <action></action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns></all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('Title', 'Title'), ('Description', 'Description')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('Title', "''"), ('Description', "''")]</default_params>
-          <description></description>
-          <domain_root_list></domain_root_list>
-          <domain_tree></domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns></editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes></global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_cookie>FOLDER_LIST</list_cookie>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list></report_root_list>
-          <report_tree></report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">1</select>
-          <selection_name>folders</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Elements contenus</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/Folder_viewSearchDialog.form b/product/ERP5/skins/erp5_core/Folder_viewSearchDialog.form
deleted file mode 100755
index 4a74f21b55a178665402e36fe0ab800e2e2dfb5b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_viewSearchDialog.form
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Search</title>
-  <row_length>4</row_length>
-  <name>Base_viewSearchResultList</name>
-  <pt>form_view_dialog</pt>
-  <action>Folder_search</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>%</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>%</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_description</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>%</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>my_description</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/Folder_viewSortOnDialog.form b/product/ERP5/skins/erp5_core/Folder_viewSortOnDialog.form
deleted file mode 100755
index 91f59bafbca8e0b13b888a589d9fac2f6b3d05b9..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Folder_viewSortOnDialog.form
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Define Sort Order</title>
-  <row_length>4</row_length>
-  <name>Folder_viewSortOnDialog</name>
-  <pt>form_sort</pt>
-  <action>Base_configureSortOn</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>sort_on</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('None', 'None'), ('Title', 'Title'), ('Id', 'id'), ('Description', 'description')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Sort Parameter</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>sort_order</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Ascending', 'ascending'), ('Descending', 'descending')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>sort_order</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/Predicate_edit.py b/product/ERP5/skins/erp5_core/Predicate_edit.py
deleted file mode 100755
index 9a9d7e817719eb23dd2d3675a1f19f60d2439096..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Predicate_edit.py
+++ /dev/null
@@ -1,74 +0,0 @@
-## Script (Python) "Predicate_edit"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id, selection_index=0, selection_name=''
-##title=
-##
-# Updates attributes of an Zope document
-# which is in a class inheriting from ERP5 Base
-#
-# TODO
-#   - Implement validation of matrix fields
-#   - Implement validation of list fields
-#
-
-from Products.Formulator.Errors import ValidationError, FormValidationError
-
-request=context.REQUEST
-
-try:
-  # Define form basic fields
-  form = getattr(context,form_id)
-  # Validate
-  form.validate_all_to_request(request)
-  # Basic attributes
-  kw = {}
-  # Parse attributes
-  for f in form.get_fields():
-    k = f.id
-    v = getattr(request,k,None)
-    if v is not None:
-      if k[0:3] == 'my_':
-        # We only take into account
-        # the object attributes
-        k = k[3:]
-        kw[k] = v
-  # Update listbox attributes
-  listbox = request.get('listbox')
-  if listbox is not None:
-    listbox_field = form.get_field('listbox')
-    gv = {}
-    if listbox_field.has_value('global_attributes'):
-      hidden_attributes = map(lambda x:x[0], listbox_field.get_value('global_attributes'))
-      for k in hidden_attributes:
-        gv[k] = getattr(request, k,None)
-    for property, v in listbox.items():
-      v.update(gv)
-      context.setCriterion(property, **v)
-  # Update basic attributes
-  context.edit(REQUEST=request,**kw)
-except FormValidationError, validation_errors:
-  # Pack errors into the request
-  field_errors = form.ErrorFields(validation_errors)
-  request.set('field_errors', field_errors)
-  return form(request)
-else:
-  if not selection_index:
-    redirect_url = '%s/%s?%s' % ( context.absolute_url()
-                              , form_id
-                              , 'portal_status_message=Data+Updated.'
-                              )
-  else:
-    redirect_url = '%s/%s?selection_index=%s&selection_name=%s&%s' % ( context.absolute_url()
-                              , form_id
-                              , selection_index
-                              , selection_name
-                              , 'portal_status_message=Data+Updated.'
-                              )
-
-
-
-request[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/Predicate_view.form b/product/ERP5/skins/erp5_core/Predicate_view.form
deleted file mode 100755
index c61ac9fdfb35e0cda75052776c7b182931620608..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Predicate_view.form
+++ /dev/null
@@ -1,279 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>View</title>
-  <row_length>4</row_length>
-  <name>Predicate_view</name>
-  <pt>form_view</pt>
-  <action>Predicate_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>ISO-8859-1</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Left</title>
-      <fields>
-
-      <field><id>my_criterion_property_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('quantity', 'quantity'), ('price', 'price')]</items>
-          <required type="int">1</required>
-          <size type="int">5</size>
-          <title>Identity Criteria</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Right</title>
-      <fields>
-
-      <field><id>my_membership_criterion_base_category_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">5</size>
-          <title>Membership criteria</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-          <items>here/portal_categories/getBaseCategoryList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_multimembership_criterion_base_category_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">5</size>
-          <title>Multivalued Membership Criteria</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-          <items>here/portal_categories/getBaseCategoryList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Center</title>
-      <fields>
-
-      <field><id>my_membership_criterion_category</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">5</size>
-          <title>Membership value</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('property', 'Property'), ('identity', 'Identity Criterion'), ('min', 'Min Criterion'), ('max', 'Max Criterion')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('identity', 'identity'), ('min', 'min'), ('max', 'max')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">20</lines>
-          <list_action>view</list_action>
-          <list_method type="method">getCriterionList</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search type="int">0</search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>range_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_method></stat_method>
-          <title>Property criteria</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Hidden</title>
-      <fields>
-
-      <field><id>listbox_identity</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>listbox_identity</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>listbox_min</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_min</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_max</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_max</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/SupplyLine_asCellRange.py b/product/ERP5/skins/erp5_core/SupplyLine_asCellRange.py
deleted file mode 100755
index 1655f13e6cdcd89f616eee0358a41dfbba1521ac..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/SupplyLine_asCellRange.py
+++ /dev/null
@@ -1,9 +0,0 @@
-## Script (Python) "SupplyLine_asCellRange"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
diff --git a/product/ERP5/skins/erp5_core/TemplateTool_getBaseCategoryListAsCSV.py b/product/ERP5/skins/erp5_core/TemplateTool_getBaseCategoryListAsCSV.py
deleted file mode 100755
index 3333c890ebc14935551008bfd5307c019943de08..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/TemplateTool_getBaseCategoryListAsCSV.py
+++ /dev/null
@@ -1,32 +0,0 @@
-## Script (Python) "TemplateTool_getBaseCategoryListAsCSV"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-category_dict = {}
-
-for bt in context.portal_templates.contentValues(filter={'portal_type':'Business Template'}):
-  category_dict[bt.getTitle()] = {}
-  for category in bt.getTemplateBaseCategoryList():
-    category_dict[bt.getTitle()][category] = 1
-
-bt_list = category_dict.keys()
-bt_list.sort()
-
-category_list = []
-for category in context.portal_categories.objectValues():
-  category_list.append(category.getId())
-category_list.sort()
-
-msg = ','.join([''] + bt_list) + '\n'
-for category in category_list:
-  msg += category
-  for bt in bt_list:
-    msg += category in category_dict[bt] and ',X' or ','
-  msg += '\n'
-
-return msg
diff --git a/product/ERP5/skins/erp5_core/TemplateTool_getModuleListAsCSV.py b/product/ERP5/skins/erp5_core/TemplateTool_getModuleListAsCSV.py
deleted file mode 100755
index f8fcaa05fe17f8d2beb5a0f357dc0a74138e6e2a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/TemplateTool_getModuleListAsCSV.py
+++ /dev/null
@@ -1,32 +0,0 @@
-## Script (Python) "TemplateTool_getModuleListAsCSV"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-module_dict = {}
-
-for bt in context.portal_templates.contentValues(filter={'portal_type':'Business Template'}):
-  module_dict[bt.getTitle()] = {}
-  for id in bt.getTemplateModuleIdList():
-    module_dict[bt.getTitle()][id] = 1
-
-bt_list = module_dict.keys()
-bt_list.sort()
-
-module_list = []
-for module in context.getPortalObject().contentValues(filter={'meta_type':'ERP5 Folder'}):
-  module_list.append(module.getId())
-module_list.sort()
-
-msg = ','.join([''] + bt_list) + '\n'
-for module in module_list:
-  msg += module
-  for bt in bt_list:
-    msg += module in module_dict[bt] and ',X' or ','
-  msg += '\n'
-
-return msg
diff --git a/product/ERP5/skins/erp5_core/TemplateTool_getPortalTypeListAsCSV.py b/product/ERP5/skins/erp5_core/TemplateTool_getPortalTypeListAsCSV.py
deleted file mode 100755
index 422597ca54491cd4ea4cb73fd45830780d1bf34b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/TemplateTool_getPortalTypeListAsCSV.py
+++ /dev/null
@@ -1,32 +0,0 @@
-## Script (Python) "TemplateTool_getPortalTypeListAsCSV"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-portal_type_dict = {}
-
-for bt in context.portal_templates.contentValues(filter={'portal_type':'Business Template'}):
-  portal_type_dict[bt.getTitle()] = {}
-  for id in bt.getTemplatePortalTypeIdList():
-    portal_type_dict[bt.getTitle()][id] = 1
-
-bt_list = portal_type_dict.keys()
-bt_list.sort()
-
-portal_type_list = []
-for t in context.portal_types.objectValues():
-  portal_type_list.append(t.id)
-portal_type_list.sort()
-
-msg = ','.join([''] + bt_list) + '\n'
-for type in portal_type_list:
-  msg += type
-  for bt in bt_list:
-    msg += type in portal_type_dict[bt] and ',X' or ','
-  msg += '\n'
-
-return msg
diff --git a/product/ERP5/skins/erp5_core/TemplateTool_getWorkflowListAsCSV.py b/product/ERP5/skins/erp5_core/TemplateTool_getWorkflowListAsCSV.py
deleted file mode 100755
index aa9d2942076178df4b28fcb2e2f772f0c433c4a2..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/TemplateTool_getWorkflowListAsCSV.py
+++ /dev/null
@@ -1,32 +0,0 @@
-## Script (Python) "TemplateTool_getWorkflowListAsCSV"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-workflow_dict = {}
-
-for bt in context.portal_templates.contentValues(filter={'portal_type':'Business Template'}):
-  workflow_dict[bt.getTitle()] = {}
-  for id in bt.getTemplateWorkflowIdList():
-    workflow_dict[bt.getTitle()][id] = 1
-
-bt_list = workflow_dict.keys()
-bt_list.sort()
-
-workflow_list = []
-for wf in context.portal_workflow.objectValues():
-  workflow_list.append(wf.getId())
-workflow_list.sort()
-
-msg = ','.join([''] + bt_list) + '\n'
-for wf in workflow_list:
-  msg += wf
-  for bt in bt_list:
-    msg += wf in workflow_dict[bt] and ',X' or ','
-  msg += '\n'
-
-return msg
diff --git a/product/ERP5/skins/erp5_core/Workflow_statusModify.py b/product/ERP5/skins/erp5_core/Workflow_statusModify.py
deleted file mode 100755
index 3ef15d359504a82f6cf88afe8164119f887217ae..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/Workflow_statusModify.py
+++ /dev/null
@@ -1,63 +0,0 @@
-## Script (Python) "Workflow_statusModify"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=form_id,dialog_id
-##title=
-##
-from Products.Formulator.Errors import ValidationError, FormValidationError
-
-request=context.REQUEST
-
-try:
-  # Validate the form
-  form = getattr(context,dialog_id)
-  form.validate_all_to_request(request)
-  kw = {}
-  for f in form.get_fields():
-    k = f.id
-    v = getattr(request,k,None)
-    if v is not None:
-      k = k[3:]
-      kw[k] = v
-  toto = context.portal_workflow.doActionFor(
-      context,
-      kw['workflow_action'],
-      **kw)
-  #return str(toto)
-except FormValidationError, validation_errors:
-  # Pack errors into the request
-  field_errors = form.ErrorFields(validation_errors)
-  request.set('field_errors', field_errors)
-  return form(request)
-except ValueError, value_error:
-  # Pack errors into the request
-  redirect_url = '%s/%s?%s%s' % ( context.absolute_url(), form_id
-                                  , 'portal_status_message=',value_error
-                                  )
-
-  context.REQUEST[ 'RESPONSE' ].redirect( redirect_url )
-else:
-  # We will check if there's an error_message
-  history_data = None
-  try:
-    history_data = context.portal_workflow.getInfoFor(ob=context.getObject(), name='history')
-  except:
-    pass
-  redirect_url = None
-  if history_data is not None:
-    last_history_data = history_data[len(history_data)-1]
-    error_message = last_history_data.get('error_message')
-    if error_message != None and error_message != '':
-      redirect_url = '%s/%s?%s' % ( context.absolute_url(), form_id
-                                  , 'portal_status_message=%s' % error_message
-                                  )
-      pass
-  if redirect_url is None:
-    redirect_url = '%s/%s?%s' % ( context.absolute_url(), form_id
-                                  , 'portal_status_message=Status+changed.'
-                                  )
-
-  context.REQUEST[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_core/base_workflow_action.form b/product/ERP5/skins/erp5_core/base_workflow_action.form
deleted file mode 100755
index deb185bd817f840f4fb6245f0fcca1b5d5fdcab2..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/base_workflow_action.form
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Validate</title>
-  <row_length>4</row_length>
-  <name>BaseWorkflow_action</name>
-  <pt>form_view_dialog</pt>
-  <action>Workflow_statusModify</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>ISO-8859-1</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_comment</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Commentaires</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>python:''</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>my_workflow_action</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title></title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.REQUEST.workflow_action</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/base_workflow_action_comment.form b/product/ERP5/skins/erp5_core/base_workflow_action_comment.form
deleted file mode 100755
index ae3a0637f62363ef30dfd1f959360446c79542e3..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/base_workflow_action_comment.form
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Validate</title>
-  <row_length>4</row_length>
-  <name>base_workflow_action_comment</name>
-  <pt>form_view_dialog</pt>
-  <action>Workflow_statusModify</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>ISO-8859-1</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_comment</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>Commentaires</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>python:''</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>my_workflow_action</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title></title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.REQUEST.workflow_action</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/create_relation_dialog.form b/product/ERP5/skins/erp5_core/create_relation_dialog.form
deleted file mode 100755
index 41677a93278c11e21946acec6c546b315766a17e..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/create_relation_dialog.form
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Create New Document(s)</title>
-  <row_length>4</row_length>
-  <name>Base_viewCreateRelationDialog</name>
-  <pt>form_create_relation_dialog</pt>
-  <action>Base_createRelation</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype>multipart/form-data</enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>relation_values</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>relation_values</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_core/doLanguage.py b/product/ERP5/skins/erp5_core/doLanguage.py
deleted file mode 100755
index bafdab8827edb50ddf5eeccb5c6b09d760ab536b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/doLanguage.py
+++ /dev/null
@@ -1,11 +0,0 @@
-## Script (Python) "doLanguage"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=language_select
-##title=
-##
-
-context.Localizer.changeLanguage(language_select)
diff --git a/product/ERP5/skins/erp5_core/search.form b/product/ERP5/skins/erp5_core/search.form
deleted file mode 100755
index 194de0af67f8d3ac5b5eab3dfd33dc76b5888ce6..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_core/search.form
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Folder Contents</title>
-  <row_length>4</row_length>
-  <name>Folder_viewContentList</name>
-  <pt>form_list</pt>
-  <action></action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>ISO-8859-1</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>search_list</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'ID'), ('portal_type', 'Type'), ('Title', 'Title'), ('Description', 'Description')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('portal_type', "''"), ('Title', "''"), ('Description', "''")]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>Base_viewSearchResultList</list_action>
-          <list_cookie>SEARCH_LIST</list_cookie>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Mail Message', 'Mail Message')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>search_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Search Results</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Assignment_view.form b/product/ERP5/skins/erp5_crm/Assignment_view.form
deleted file mode 100755
index 8964715dad7f8b21e749cc051f55eb5c33fcf556..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Assignment_view.form
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Assignment</title>
-  <row_length>4</row_length>
-  <name>General</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>ID</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/id</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Begin</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>End</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Right</title>
-      <fields>
-
-      <field><id>my_function</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Registered office', 'Registered office'), ('Store', 'Store'), ('Wharehouse', 'Wharehouse'), ('Workshop', 'Workshop')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Function</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getDefaultFunction</default>
-          <items>here/portal_categories/function/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_activity</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Distribution', 'Distribution'), ('Manufacture', 'Manufacture'), ('Transport', 'Transport')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Activity</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getDefaultActivity</default>
-          <items>here/portal_categories/activity/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Middle</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Comments</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">100</width>
-        </values>
-        <tales>
-          <default>here/Description</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>List</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Career_shiftDefault.py b/product/ERP5/skins/erp5_crm/Career_shiftDefault.py
deleted file mode 100755
index 52f0e666457dbbf6de8c0657785195b1752a34e5..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Career_shiftDefault.py
+++ /dev/null
@@ -1,45 +0,0 @@
-## Script (Python) "Career_shiftDefault"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-object_list = []
-default_career = None
-new_start_date = None
-
-# Create a list of all career line except the default one
-for object in context.objectValues():
-    if object.getPortalType() == 'Career':
-        if object.getId() != 'default_career':    
-            object_list += [object]
-        else:
-            default_career = object
-            new_start_date = default_career.getStopDate()
-
-# No default career
-if default_career == None:
-    return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/Person_viewCareer' + '?portal_status_message=Current+career+need+to+be+defined')
-
-# Inverse sort of the list by id
-object_list.sort(lambda x, y: -cmp(int(x.getId()), int(y.getId())))
-
-# Shift all career lines id values
-new_id = str(context.generateNewId())
-for career_line in object_list:
-    current_id = career_line.getId()
-    context.manage_renameObject(current_id, new_id)
-    new_id = current_id
-
-# Create a new default_career
-context.manage_renameObject('default_career', new_id)
-new_default = context.manage_copyObjects(ids=(new_id,))
-new_object = context.manage_pasteObjects(new_default)
-context.manage_renameObject(new_object[0]['new_id'], 'default_career')
-context.setDefaultCareerStopDate(None)
-context.setDefaultCareerStartDate(new_start_date)
-
-return context.REQUEST.RESPONSE.redirect(context.absolute_url() + '/Person_viewCareer' + '?portal_status_message=New+career+step+added')
diff --git a/product/ERP5/skins/erp5_crm/Career_view.form b/product/ERP5/skins/erp5_crm/Career_view.form
deleted file mode 100755
index 4e615224d23237f64c5d2e41ad2558f748aadceb..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Career_view.form
+++ /dev/null
@@ -1,397 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Career</title>
-  <row_length>4</row_length>
-  <name>General</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>ID</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/id</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_subordination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>subordination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Organisation</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Begin</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">1</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>End</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Right</title>
-      <fields>
-
-      <field><id>my_collective_agreement_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Collective agreement title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_role</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Role</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getDefaultRole</default>
-          <items>here/portal_categories/role/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_grade</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Grade</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getDefaultGrade</default>
-          <items>here/portal_categories/grade/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_salary_level</id> <type>IntegerField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <end></end>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <start></start>
-          <title>Salary level</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_integer">You did not enter an integer.</message>
-          <message name="integer_out_of_range">The integer you entered was out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_salary_coefficient</id> <type>IntegerField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <end></end>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <start></start>
-          <title>Salary coefficient</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_integer">You did not enter an integer.</message>
-          <message name="integer_out_of_range">The integer you entered was out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_skill_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">5</size>
-          <title>Skills</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-        </values>
-        <tales>
-          <default>here/getSkillList</default>
-          <items>here/portal_categories/skill/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Middle</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Comments</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">100</width>
-        </values>
-        <tales>
-          <default>here/Description</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>List</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/EventModule_createEventFromMail.py b/product/ERP5/skins/erp5_crm/EventModule_createEventFromMail.py
deleted file mode 100755
index 00e7332c209b0041cfb7ef32dfdd1c905977dafa..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/EventModule_createEventFromMail.py
+++ /dev/null
@@ -1,104 +0,0 @@
-## Script (Python) "EventModule_createEventFromMail"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=theMail
-##title=
-##
-import string
-
-mail_message = None
-
-try:
-  id = container.strip_punctuation(theMail['headers']['message-id'])
-  subject = theMail['headers'].get('subject')
-  attachments = theMail['attachments']
-  if subject.find('PhoneCall:') >= 0 or subject.find('j2 Voice Message') >= 0:
-    mail_message = context.event.newContent(portal_type='Phone Call', id=id)
-  elif subject.find('Letter:') >= 0:
-    mail_message = context.event.newContent(portal_type='Incoming Letter', id=id)
-  elif subject.find('j2 Fax') >= 0 or subject.find('fax from') >= 0:
-    mail_message = context.event.newContent(portal_type='Incoming Fax', id=id)
-  else:
-    mail_message = context.event.newContent(portal_type='Mail Message', id=id)
-
-  subject=str(string.join(theMail['headers'].get('subject')))
-
-  mail_message.edit(
-                  title = theMail['headers'].get('subject'),
-                  date = theMail['headers'].get('date'),
-                  to = theMail['headers'].get('to'),
-                  sender = theMail['headers'].get('from'),
-                  reply_to = theMail['headers'].get('replyto'),
-                  body = theMail['body'],
-                  header = theMail['headers'],
-                  other_info = theMail['localpart'],
-                 )
-
-  for key, attachment_data in attachments.items():
-    try:
-      #portal_type = context.content_type_registry.findTypeName(key, '//', attachment_data)
-      portal_type = 'File'
-      new_file = mail_message.newContent(portal_type = portal_type , id=key.replace('/','_'), file=attachment_data)  
-    except:
-      mail_message.setDescription('Error in creating attachments')
-     
-
-  # We should now try to guess the user who sent it
-  # Guess the mail address:
-  mail_from = theMail['headers'].get('from')
-  at_place = mail_from.find('@')
-  mail_address = None
-  if at_place != -1:
-    begin = max(mail_from.rfind('<',0,at_place),mail_from.rfind(' ',0,at_place))
-    end = min(mail_from.rfind('>',at_place),mail_from.rfind(' ',at_place),len(mail_from))
-    mail_address = mail_from[begin+1:end]
-  # find the person with this mail
-  if mail_address is not None:
-    kw = {'portal_type':'Email',
-          'query':"SearchableText LIKE '%%%s%%'" % mail_address }
-    result = context.portal_catalog.searchResults(**kw)
-    for object in result:
-      object = object.getObject()
-      parent = object.aq_parent
-      if parent.getPortalType() == 'Person':
-        organisation = parent.getSubordinationValue()
-        if organisation is None:
-          mail_message.setSourceValue(parent)
-        else:
-          mail_message.setSourceValueList([parent, organisation])
-      elif parent.getPortalType() == 'Organisation':
-        mail_message.setSourceValue(parent)
-      break
-
-  # We should look if there's already a sale opportunity
-  # or a support wich can corresponds to this email
-  subject = mail_message.getTitle()
-  if subject != '' and subject is not None:
-    if subject.find('Re: ')==0:
-      subject = subject[len('Re: '):]
-    kw = {'portal_type':'Sale Opportunity',
-          'query':"SearchableText LIKE '%%%s%%'" % subject }
-    result = context.portal_catalog.searchResults(**kw)
-    for object in result:
-      object = object.getObject()
-      # Check if this sale opportunity corresponds to this client
-      # If so, then we can assign this mail to the sale opportunity
-      if mail_message.getSourceValue() in object.getClientValueList():
-        mail_message.setFollowUpValue(object)
-        mail_message.assign()
-
-
-except:
-  try:
-    if mail_message is not None and hasattr(edit):
-      mail_message.edit(title='Bad mail message received')
-  except:
-    pass
-
-# the return of None indicates a success
-# The return of anything else assumes that you are returning an error message
-# and most MTA's will bounce that error message back to the mail sender
-return None
diff --git a/product/ERP5/skins/erp5_crm/Event_createSaleOpportunity.py b/product/ERP5/skins/erp5_crm/Event_createSaleOpportunity.py
deleted file mode 100755
index a5ab518bb0698eaa7ab48256bef3c2285f8d6b82..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Event_createSaleOpportunity.py
+++ /dev/null
@@ -1,31 +0,0 @@
-## Script (Python) "Event_createSaleOpportunity"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# this script allow to create a new object from this current one
-
-current_object = context.getObject()
-module = context.getPortalObject().opportunity
-
-# Create a new object
-new_id = str(module.generateNewId())
-context.portal_types.constructContent(type_name='Sale Opportunity',
-        container=module,
-        id=new_id
-)
-new_object = module[new_id]
-
-
-# If we do this before, each added line will take 20 times more time
-# because of programmable acquisition
-new_object.edit(
-        title=current_object.getTitle(),
-        client_value_list = current_object.getSourceValueList()
-)
-# Now create the relation between the current object and the new one
-current_object.setFollowUpValueList([new_object])
diff --git a/product/ERP5/skins/erp5_crm/Event_createSupportRequest.py b/product/ERP5/skins/erp5_crm/Event_createSupportRequest.py
deleted file mode 100755
index c8eef7a27feb0a7234223592e734c2213312c4a5..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Event_createSupportRequest.py
+++ /dev/null
@@ -1,31 +0,0 @@
-## Script (Python) "Event_createSupportRequest"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# this script allow to create a new object from this current one
-
-current_object = context.getObject()
-module = context.getPortalObject().support_request
-
-# Create a new object
-new_id = str(module.generateNewId())
-context.portal_types.constructContent(type_name='Support Request',
-        container=module,
-        id=new_id
-)
-new_object = module[new_id]
-
-
-# If we do this before, each added line will take 20 times more time
-# because of programmable acquisition
-new_object.edit(
-        title=current_object.getTitle(),
-        client_value_list = current_object.getSourceValueList()
-)
-# Now create the relation between the current object and the new one
-current_object.setFollowUpValueList([new_object])
diff --git a/product/ERP5/skins/erp5_crm/OrganisationModule_viewOrganisationList.form b/product/ERP5/skins/erp5_crm/OrganisationModule_viewOrganisationList.form
deleted file mode 100755
index 4e8f3497a9565fc4f55c074300ff58c9a02a5788..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/OrganisationModule_viewOrganisationList.form
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Organisation</title>
-  <row_length>4</row_length>
-  <name>OrganisationModule_viewOrganisationList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[('Title', 'Name'), ('getRole', 'Role'), ('getGroup', 'Group'), ('getActivity', 'Activity'), ('getFunction', 'Function'), ('getDefaultEmailText', 'Email'), ('getDefaultTelephoneText', 'Phone'), ('getDefaultFaxText', 'Fax'), ('getDefaultAddressText', 'Address'), ('getDefaultRegion', 'Region'), ('Description', 'Description'), ('validation_state', 'State')]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('Title', 'Name'), ('getDefaultTelephoneText', 'Phone'), ('getDefaultRegion', 'Region'), ('getRole', 'Role'), ('getGroup', 'Group'), ('getActivity', 'Activity'), ('getFunction', 'Function'), ('Description', 'Description'), ('validation_state', 'State')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[('portal_categories/activity', 'Activity'), ('portal_categories/function', 'Function'), ('portal_categories/role', 'Role'), ('portal_categories/region', 'Region'), ('portal_categories/group', 'Group')]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">25</lines>
-          <list_action>list</list_action>
-          <list_cookie>ORGANISATION_LIST</list_cookie>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Organisation', 'Organisation')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>organisation_selection</selection_name>
-          <sort type="list">[('Title', 'Title')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns type="list">[]</stat_columns>
-          <stat_method></stat_method>
-          <title>Organisation List</title>
-          <url_columns type="list">[]</url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Organisation_edit.py b/product/ERP5/skins/erp5_crm/Organisation_edit.py
deleted file mode 100755
index 47055f7a4ea20d0a3350758891e952602111e77d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Organisation_edit.py
+++ /dev/null
@@ -1,31 +0,0 @@
-## Script (Python) "Organisation_edit"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-from Products.Formulator.Errors import ValidationError, FormValidationError
-
-request=context.REQUEST
-
-try:
-  # Validate the form
-  context.Organisation_view.validate_all_to_request(request)
-  context.edit(id=request.my_id
-             , title=request.my_title
-             , corporate_name = request.my_corporate_name
-      , description = request.my_description)
-except FormValidationError, validation_errors:
-  # Pack errors into the request
-  field_errors = context.Organisation_view.ErrorFields(validation_errors)
-  request.set('field_errors', field_errors)
-  return context.Organisation_view(request)
-else:
-  redirect_url = '%s/Organisation_view?%s' % ( context.absolute_url()
-                                  , 'portal_status_message=Data+Updated.'
-                                  )
-
-request[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_crm/Organisation_exportAsText.pt b/product/ERP5/skins/erp5_crm/Organisation_exportAsText.pt
deleted file mode 100755
index 8cf07f551ecbee14cc009b744bd6d6c22dcb028b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Organisation_exportAsText.pt
+++ /dev/null
@@ -1 +0,0 @@
-  <id tal:content="here/id"></id>
diff --git a/product/ERP5/skins/erp5_crm/Organisation_view.form b/product/ERP5/skins/erp5_crm/Organisation_view.form
deleted file mode 100755
index f0180865d224e7b88e8d698fc2c2ede11a7b6d2c..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Organisation_view.form
+++ /dev/null
@@ -1,553 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Organisation</title>
-  <row_length>4</row_length>
-  <name>General</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getId</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Usual Name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getTitle</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_corporate_name</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Corporate Name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getCorporateName</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_role</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Role</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/role/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_group</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Group</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/group/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_activity</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Activity</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/activity/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_function</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Function</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/function/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_validation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Validation State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_default_email_text</id> <type>EmailField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Email</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-          <message name="not_email">You did not enter an email address.</message>
-        </messages>
-      </field>
-      <field><id>my_default_telephone_text</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Telephone</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_fax_text</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Fax</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_address_street_address</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Address</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">30</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_default_address_zip_code</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Post Code</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_address_city</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>City</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_address_region</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Country</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/region/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Comments</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">100</width>
-        </values>
-        <tales>
-          <default>here/Description</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Contact'), ('asText', 'Value')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_cookie>CONTACT_LIST</list_cookie>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Address', 'Address'), ('Telephone', 'Telephone'), ('Email', 'Email'), ('Fax', 'Fax')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>contact_list</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Contacts</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Organisation_viewContactList.form b/product/ERP5/skins/erp5_crm/Organisation_viewContactList.form
deleted file mode 100755
index 40cc0e78240d1f740fa423b0ab9754e943260cb6..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Organisation_viewContactList.form
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title></title>
-  <row_length>4</row_length>
-  <name>OrganisationModule_viewOrganisationList</name>
-  <pt>form_list</pt>
-  <action></action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>contact_list</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns></all_columns>
-          <all_editable_columns></all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('Title', 'Title'), ('Description', 'Description')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('Title', "''"), ('Description', "''")]</default_params>
-          <description></description>
-          <domain_root_list></domain_root_list>
-          <domain_tree></domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns></editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes></global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action></list_action>
-          <list_cookie>ORGANISATION_LIST</list_cookie>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[('ERP5 Telephone', 'ERP5 Telephone'), ('Document', 'Document'), ('Base18 Document', 'Base18 Document')]</meta_types>
-          <portal_types></portal_types>
-          <report_root_list></report_root_list>
-          <report_tree></report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns></search_columns>
-          <select></select>
-          <selection_name></selection_name>
-          <sort></sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Contacts</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Organisation_viewCoordinateList.form b/product/ERP5/skins/erp5_crm/Organisation_viewCoordinateList.form
deleted file mode 100755
index c32d11d630514f6fdfa5eac319181aebf1fa9ac8..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Organisation_viewCoordinateList.form
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title></title>
-  <row_length>4</row_length>
-  <name>OrganisationModule_viewOrganisationList</name>
-  <pt>form_list</pt>
-  <action></action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>coordinate_list</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('Title', 'Title'), ('AsText', 'Coordinate')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('min', '(0,1,3)'), ('max', '100')]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>list</list_action>
-          <list_cookie>COORDINATE_LIST</list_cookie>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[('ERP5 Telephone', 'ERP5 Telephone')]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>organisation_coordiante_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns type="list">[]</stat_columns>
-          <stat_method></stat_method>
-          <title>Coordinates</title>
-          <url_columns type="list">[]</url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Organisation_viewDetails.form b/product/ERP5/skins/erp5_crm/Organisation_viewDetails.form
deleted file mode 100755
index c81e23f9cb6c8a12b013def16af49199124ca2a2..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Organisation_viewDetails.form
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Organisation</title>
-  <row_length>4</row_length>
-  <name>Details</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_social_form</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Social form</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/social_form/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_creation_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>dmy</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Creation date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_corporate_registration_code</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Corporate registration code</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_geographic_incorporate_code</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Geographic incorporate code</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_ean13_code</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>EAN 13 code</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_activity_code</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Activity code</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_vat_code</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>VAT code</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <read_only type="int">0</read_only>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Social organisation</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_social_code</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Social code</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_social_capital</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Social capital</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_social_capital_currency</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Social capital currency</title>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/l0/getDefaultResource | nothing</default>
-          <items>python:map(lambda x: (x.id,'currency/%s' % x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_market_segment_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">3</size>
-          <title>Segmentation</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-        </values>
-        <tales>
-          <items>python:tuple(here.portal_categories.market_segment.getCategoryChildLogicalPathItemList())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/PersonModule_viewPersonList.form b/product/ERP5/skins/erp5_crm/PersonModule_viewPersonList.form
deleted file mode 100755
index 899729d9cf0f81b05bcfbe2c5a6d9e9db84c6ecc..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/PersonModule_viewPersonList.form
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Person</title>
-  <row_length>4</row_length>
-  <name>PersonModule_viewPersonList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[('Title', 'Name'), ('getSubordinationTitle', 'Organisation'), ('getRole', 'Role'), ('getGroup', 'Group'), ('getActivity', 'Activity'), ('getFunction', 'Function'), ('getDefaultEmailText', 'Email'), ('getDefaultTelephoneText', 'Phone'), ('getDefaultFaxText', 'Fax'), ('getDefaultAddressText', 'Address'), ('getDefaultRegion', 'Region'), ('validation_state', 'State'), ('Description', 'Description')]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('Title', 'Name'), ('getSubordinationTitle', 'Organisation'), ('getDefaultTelephoneText', 'Phone'), ('getDefaultRegion', 'Region'), ('getRole', 'Role'), ('getActivity', 'Activity'), ('getFunction', 'Function'), ('Description', 'Description'), ('validation_state', 'State')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('Title', "''"), ('Description', "''")]</default_params>
-          <description></description>
-          <domain_root_list type="list">[('portal_categories/activity', 'Activity'), ('portal_categories/group', 'Group'), ('portal_categories/region', 'Region'), ('portal_categories/role', 'Role'), ('portal_categories/skill', 'Skill')]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_cookie>PERSON_LIST</list_cookie>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <more_columns type="list">[('path', 'Path')]</more_columns>
-          <portal_types type="list">[('Person', 'Person')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>person_selection</selection_name>
-          <sort type="list">[('Title', 'Title')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns type="list">[]</stat_columns>
-          <stat_method></stat_method>
-          <title>Person List</title>
-          <url_columns type="list">[]</url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/PersonModule_viewSortOnDialog.form b/product/ERP5/skins/erp5_crm/PersonModule_viewSortOnDialog.form
deleted file mode 100755
index 7d64d0f8bfd0db90603880d0adaf82f6e64167c3..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/PersonModule_viewSortOnDialog.form
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Define Sort Order</title>
-  <row_length>4</row_length>
-  <name>PersonModule_viewSortOnDialog</name>
-  <pt>form_sort</pt>
-  <action>Base_configureSortOn</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>sort_on</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('None', 'None'), ('Title', 'Title'), ('Id', 'id'), ('Description', 'description')]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Sort Parameter</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>sort_order</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Ascending', 'ascending'), ('Descending', 'descending')]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>sort_order</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python: ''</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_exchange.form b/product/ERP5/skins/erp5_crm/Person_exchange.form
deleted file mode 100755
index 804b26808d4738f8924c2e5f25cd97864ee945eb..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_exchange.form
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Import / Export</title>
-  <row_length>4</row_length>
-  <name>exchange</name>
-  <pt>form_dialog</pt>
-  <action>base_search</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>external_file</id> <type>FileField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <title>File</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_description</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>my_description</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_view.form b/product/ERP5/skins/erp5_crm/Person_view.form
deleted file mode 100755
index 096a7b38f5d4938a0997b641e7b8f1bb493372c4..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_view.form
+++ /dev/null
@@ -1,529 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Person</title>
-  <row_length>4</row_length>
-  <name>General</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>ID</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getId</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_first_name</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Personal Name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_last_name</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Surname</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_gender</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Gender</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/gender/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_nationality</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Nationality</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/nationality/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_subordination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>subordination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id>setCareerSubordinationUidList</relation_setter_id>
-          <required type="int">0</required>
-          <title>Current organisation</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_validation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Validation State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_default_email_text</id> <type>EmailField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Email</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getDefaultEmailText</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-          <message name="not_email">You did not enter an email address.</message>
-        </messages>
-      </field>
-      <field><id>my_default_telephone_text</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Telephone</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_fax_text</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Fax</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_address_street_address</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Address</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">30</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_default_address_zip_code</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Post Code</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_address_city</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>City</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_address_region</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Country</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/region/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Comments</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">100</width>
-        </values>
-        <tales>
-          <default>here/Description</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Contact'), ('asText', 'Value')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_cookie>CONTACT_LIST</list_cookie>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Address', 'Address'), ('Email', 'Email'), ('Telephone', 'Telephone')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>contact_list</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Contacts</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_viewAssignment.form b/product/ERP5/skins/erp5_crm/Person_viewAssignment.form
deleted file mode 100755
index 233035830fcd16ac24b8745de18c86fc23dd2b9e..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_viewAssignment.form
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Person Assignment View</title>
-  <row_length>4</row_length>
-  <name>General</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>ID</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Usual Name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[('getStartDate', 'getStartDate'), ('getStopDate', 'getStopDate')]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('getStartDate', 'Begin'), ('getStopDate', 'End'), ('title', 'Title'), ('function', 'Function'), ('activity', 'Activity')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('Title', "''")]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('getStartDate', 'getStartDate'), ('getStopDate', 'getStopDate')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_cookie>CONTACT_LIST</list_cookie>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Assignment', 'Assignment')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>folder_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Assignments</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_viewCareer.form b/product/ERP5/skins/erp5_crm/Person_viewCareer.form
deleted file mode 100755
index ab25d368c4c3d0bbbd23fa0901f0f8413c9f3fa2..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_viewCareer.form
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Person Career View</title>
-  <row_length>4</row_length>
-  <name>General</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>ID</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Usual name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_career_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Career title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_career_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Beginning of this career step</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_default_career_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">1</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>End of this current career step</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_subordination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>subordination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id>setCareerSubordinationUidList</relation_setter_id>
-          <required type="int">0</required>
-          <title>Current organisation</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_default_collective_agreement_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Collective agreement title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_career_salary_level</id> <type>IntegerField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <end></end>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <start></start>
-          <title>Current salary level</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_integer">You did not enter an integer.</message>
-          <message name="integer_out_of_range">The integer you entered was out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_default_career_salary_coefficient</id> <type>IntegerField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <end></end>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <start></start>
-          <title>Current salary coefficient</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_integer">You did not enter an integer.</message>
-          <message name="integer_out_of_range">The integer you entered was out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_career_role</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Current role</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/role/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_career_grade</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Current grade</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/grade/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_career_skill_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">5</size>
-          <title>Current skills</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-          <items>here/portal_categories/skill/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_default_career_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Current career comments</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">100</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[('getStartDate', 'getStartDate'), ('getStopDate', 'getStopDate')]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('getStartDate', 'Begin'), ('getStopDate', 'End'), ('title', 'Title'), ('getSubordinationTitle', 'Organisation'), ('collective_agreement_title', 'Collective agreement'), ('role', 'Role'), ('grade', 'Grade'), ('salary_level', 'Salary level'), ('salary_coefficient', 'Salary coeff.')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('Title', "''")]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('getStartDate', 'getStartDate'), ('getStopDate', 'getStopDate')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_cookie>CONTACT_LIST</list_cookie>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Career', 'Career')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>folder_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Career step list</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_viewCareerLogAsHTML.pt b/product/ERP5/skins/erp5_crm/Person_viewCareerLogAsHTML.pt
deleted file mode 100755
index 0225f31de5fb1635aa1ba483c76f04ed686f9cb4..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_viewCareerLogAsHTML.pt
+++ /dev/null
@@ -1,43 +0,0 @@
-<html>
-  <head>
-    <title tal:content="template/title">The title</title>
-  </head>
-  <body>
-    
-    <img src="logo.png" />
-
-    <h2 align="center"><span tal:condition="template/title"
-              tal:replace="template/title">optional template id</span></h2>
-   
-    <table width="100%" border="1">
-     <tr>
-          <th>Nom</th>
-          <th>Date Naissance</th>
-          <th>Nationalité</th>
-          <th>Sexe</th>
-          <th>Compétences</th>
-          <th>Affectation</th>
-          <th>Arrivée</th>
-          <th>Départ</th>
-          <th>Description</th>
-     </tr>
-      <tr tal:repeat="item python:here.Base_sortObjectListLikeSQL(here.Person_zGetPersonCareerLog(),(('start_date','ASC'),))">
-         <span tal:define="my_assignment python:item.getObject();
-                                   my_person python:my_assignment.aq_parent"
-                    >
-          <td valign="top"><a tal:content="my_person/getTitle" 
-                       tal:attributes="href python:'%s/Person_viewProfile' % my_person.getRelativeUrl()" /></td>
-          <td valign="top" ><font size="-2" tal:content="my_assignment/getBirthday"/></td>
-          <td valign="top" ><font size="-2" tal:content="my_assignment/getDefaultNationality"/></td>
-          <td valign="top" ><font size="-2" tal:content="my_assignment/getGender"/></td>
-          <td valign="top"><font size="-2"><ul><li tal:repeat="skill my_assignment/getSkillList"
-                            tal:content="skill"></li></ul></font></td>
-          <td valign="top"><a tal:content="item/getTitle" tal:attributes="href item/getPath"/></td>
-          <td valign="top"><font size="-2" tal:content="my_assignment/getStartDate"/></td>
-          <td valign="top"><font size="-2" tal:content="my_assignment/getStopDate"/></td>
-          <td valign="top"><font size="-2" tal:content="item/Description"/></td>
-        </span>
-      </tr>
-    </table>
-  </body>
-</html>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_viewDetails.form b/product/ERP5/skins/erp5_crm/Person_viewDetails.form
deleted file mode 100755
index 15aef45db6cfba776a3fb109e5e93cb99188aa0a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_viewDetails.form
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Details</title>
-  <row_length>4</row_length>
-  <name>Person_viewDetails</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>ID</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Usual Name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_first_name</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Personal Name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getFirstName</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_last_name</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Surname</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getLastName</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_middle_name</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Middle Name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getMiddleName</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_prefix</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Prefix</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getPrefix</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_suffix</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Suffix</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getSuffix</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_social_code</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Social code</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Comments</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">100</width>
-        </values>
-        <tales>
-          <default>here/Description</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_viewPhoneList.form b/product/ERP5/skins/erp5_crm/Person_viewPhoneList.form
deleted file mode 100755
index 843d6a1bc91ae2865a60101460c7f3c5231f0467..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_viewPhoneList.form
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Folder Contents</title>
-  <row_length>4</row_length>
-  <name>Folder_viewContentList</name>
-  <pt>form_list</pt>
-  <action></action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[('catalog.path', 'Path'), ('catalog.id', 'Id'), ('catalog.Title', 'Titlex'), ('catalog.Description', 'Description'), ('phone.path', 'Phone')]</all_columns>
-          <all_editable_columns></all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('catalog.id', 'Id'), ('catalog.Title', 'Titlex'), ('catalog.Description', 'Description'), ('phone.path', 'Phone')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('Title', "''"), ('Description', "''")]</default_params>
-          <description></description>
-          <domain_root_list></domain_root_list>
-          <domain_tree></domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns></editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes></global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action></list_action>
-          <list_cookie>PERSON_LIST</list_cookie>
-          <list_method type="method">person_search_phone</list_method>
-          <meta_types type="list">[]</meta_types>
-          <more_columns type="list">[('path', 'Path')]</more_columns>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list></report_root_list>
-          <report_tree></report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">1</select>
-          <selection_name>persons</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Contacts</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_viewProfile.form b/product/ERP5/skins/erp5_crm/Person_viewProfile.form
deleted file mode 100755
index 504f22791c6965a4316589204b1538e6147bc052..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_viewProfile.form
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Person</title>
-  <row_length>4</row_length>
-  <name>General</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Usual Name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_career_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Career title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_career_grade</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Current grade</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/grade/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_career_function</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Function</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/function/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_career_role</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Current role</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/role/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_career_activity</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Activity</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/activity/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_career_group</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Group</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/group/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Right</title>
-      <fields>
-
-      <field><id>my_career_product_line_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">6</size>
-          <title>Product Interest</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-          <items>here/portal_categories/product_line/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_career_skill_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">6</size>
-          <title>Current skills</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-          <items>here/portal_categories/skill/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Middle</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Comments</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">100</width>
-        </values>
-        <tales>
-          <default>here/Description</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>List</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_viewReport.form b/product/ERP5/skins/erp5_crm/Person_viewReport.form
deleted file mode 100755
index bc4b1c5d91d242de5029ecc2fdde4d3e43030602..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_viewReport.form
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title></title>
-  <row_length>4</row_length>
-  <name>Person_viewSearchDialog</name>
-  <pt>form_dialog</pt>
-  <action>base_search</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_description</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>my_description</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_viewSearchDialog.form b/product/ERP5/skins/erp5_crm/Person_viewSearchDialog.form
deleted file mode 100755
index 934474b245a8d11d7f9eb35b906d60a228302bee..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_viewSearchDialog.form
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Search</title>
-  <row_length>4</row_length>
-  <name>Person_viewSearchDialog</name>
-  <pt>form_dialog</pt>
-  <action>PersonModule_viewPersonList</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_Title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>%</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>%</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_Description</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>%</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Description</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_viewSearchEmailDialog.form b/product/ERP5/skins/erp5_crm/Person_viewSearchEmailDialog.form
deleted file mode 100755
index ec23bacdb73427714f9623d9e45a2b7cd6f3ff56..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_viewSearchEmailDialog.form
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>List Emails</title>
-  <row_length>4</row_length>
-  <name>Person_viewSearchDialog</name>
-  <pt>form_dialog</pt>
-  <action>person_emails_report</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_role</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">1</required>
-          <size type="int">5</size>
-          <title>Role</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/role/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_region</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">1</required>
-          <size type="int">5</size>
-          <title>Role</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/region/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_skill</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">1</required>
-          <size type="int">5</size>
-          <title>Role</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/skill/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_viewSearchPhoneDialog.form b/product/ERP5/skins/erp5_crm/Person_viewSearchPhoneDialog.form
deleted file mode 100755
index 0f66b20c04ceaa9280347c9c644ec35f6f4d44e1..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_viewSearchPhoneDialog.form
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Search</title>
-  <row_length>4</row_length>
-  <name>Base_viewSearchResultList</name>
-  <pt>form_dialog</pt>
-  <action>Person_viewPhoneList</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>%</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>%</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Person_zGetPersonCareerLog.zsql b/product/ERP5/skins/erp5_crm/Person_zGetPersonCareerLog.zsql
deleted file mode 100755
index c6e7095718e2173a0559de9ff14adc0c0b692317..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Person_zGetPersonCareerLog.zsql
+++ /dev/null
@@ -1,14 +0,0 @@
-<dtml-comment>
-title:Registre du personnel
-connection_id:MySQL
-max_rows:10
-max_cache:0
-cache_time:1
-class_name:ZSQLBrain
-class_file:zsqlbrain.py
-</dtml-comment>
-<params></params>
-SELECT *
-FROM catalog 
-WHERE portal_type = 'Assignment'
-ORDER BY Date
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/ProjectLine_view.form b/product/ERP5/skins/erp5_crm/ProjectLine_view.form
deleted file mode 100755
index 7eb12c5229ac0e06aacb3b29ac825f38fdede23e..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/ProjectLine_view.form
+++ /dev/null
@@ -1,328 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Project Line</title>
-  <row_length>4</row_length>
-  <name>ProjectLine_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype>multipart/form-data</enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_target_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Start</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_target_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Stop</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Right</title>
-      <fields>
-
-      <field><id>my_source_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>person</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Collaborateur</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_base_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Taux horaire ou journalier</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity_unit</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Hour', 'Hour'), ('Day', 'Day')]</items>
-          <required type="int">1</required>
-          <size type="int">2</size>
-          <title>Unit</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_target_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Lieu</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/ProjectModule_viewProjectList.form b/product/ERP5/skins/erp5_crm/ProjectModule_viewProjectList.form
deleted file mode 100755
index 94e59e5f8e8453487dfcca97c0c3942c750a5a7d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/ProjectModule_viewProjectList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Project</title>
-  <row_length>4</row_length>
-  <name>ProjectModule_viewProjectList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'ID'), ('title', 'Title'), ('default_destination_title', 'Real Client'), ('default_destination_section_title', 'Invoiced Client'), ('getStartDate', 'Start Date'), ('getStopDate', 'Stop Date')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Project', 'Project')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>project_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Project List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/ProjectReportLine_view.form b/product/ERP5/skins/erp5_crm/ProjectReportLine_view.form
deleted file mode 100755
index 72afe86f6eaed0c777d66b547b40f0258a20c26b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/ProjectReportLine_view.form
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>line of a project report</title>
-  <row_length>4</row_length>
-  <name>ProjectReportLine_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Project report line Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>dmy</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>start date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>dmy</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>stop date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_default_order_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>order</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>project</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Project', 'Project')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Project</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getDefaultOrderTitle</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_id</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>Billiable</default>
-          <description>This field describes if the line expense can be billiable to the invoiced client</description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Billiable', 'Billiable'), ('Non Billiable', 'Non Billiable')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Billiable ?</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description>The client for which the expense was done</description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Client</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity_unit</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>EUR</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:map(lambda x: (x.id,'currency/%s' % x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_expense_type</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Expense Type</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/expense_type/getCategoryChildTitleItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>destination_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Reimboursement</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>source_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Amount</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/ProjectReportModule_viewProjectReportList.form b/product/ERP5/skins/erp5_crm/ProjectReportModule_viewProjectReportList.form
deleted file mode 100755
index 7bcf6ed2e10f0f4b9f789d1886765b98c68b95ea..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/ProjectReportModule_viewProjectReportList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Project Report</title>
-  <row_length>4</row_length>
-  <name>ProjectReportModule_viewProjectReportList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('Start_date', 'Start Date'), ('Stop_date', 'Stop Date'), ('Source_section_title', 'name of the employee'), ('project_report_state', 'state'), ('TotalBilliableQuantity', 'Billiable Expense'), ('TotalNonBilliableQuantity', 'Non Billiable Expense'), ('TotalQuantity', 'Total')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Project Report', 'Project Report')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>project report selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Project Report List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/ProjectReport_view.form b/product/ERP5/skins/erp5_crm/ProjectReport_view.form
deleted file mode 100755
index ef865e4d63ee7492da919d31e6a87749d136c08c..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/ProjectReport_view.form
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>View of a project report</title>
-  <row_length>4</row_length>
-  <name>ProjectReport_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id of a project report</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>person</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Worker name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_section_id</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_section</base_category>
-          <catalog_index>Id</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>person</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('person', 'person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Worker Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>dmy</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>start date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>dmy</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>stop date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>project_report_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Project Report State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'project_report_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Center</title>
-      <fields>
-
-      <field><id>TotalBilliableQuantity</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Billiable Expense</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>TotalNonBilliableQuantity</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Non Billiable Expense</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>TotalQuantity</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Total Expense</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[('id', 'id'), ('Title', 'Title'), ('target_quantity', 'target_quantity')]</all_columns>
-          <all_editable_columns type="list">[('target_quantity', 'target_quantity')]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('Start_date', 'Date'), ('Default_order_title', 'Projet'), ('target_quantity', 'target_quantity'), ('Title', 'Title')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('target_quantity', 'target_quantity')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>list</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Project Report Line', 'Project Report Line')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">1</select>
-          <selection_name>project_report_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>listbox</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Hidden</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/Project_view.form b/product/ERP5/skins/erp5_crm/Project_view.form
deleted file mode 100755
index 9c54c8e61933cac3bf3dc53e06d6f450f0a2c7fb..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/Project_view.form
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>View of a project</title>
-  <row_length>4</row_length>
-  <name>Project_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id of the project</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Project Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Invoiced Client</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Real Client</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>dmy</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Start Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>dmy</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Stop Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>TotalEstimatedTime</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description>The total estimated time spent on the project</description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Estimated Time</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>TotalBilliableTime</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description>The estimated revenue that project brings to the company</description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Revenue of Billiable Time</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>TotalEstimatedBilliableTime</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description>The estimated billiable time that project brings to the company</description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Estimated Billiable Time</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[('id', 'id'), ('Title', 'Title'), ('source_title', 'Colleague'), ('target_quantity', 'Estimated Time'), ('destination_title', 'Location')]</all_columns>
-          <all_editable_columns type="list">[('target_quantity', 'Estimated Time')]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('Title', 'Task Title'), ('source_title', 'Colleague'), ('target_quantity', 'Estimated Time'), ('quantity_unit', 'Unit'), ('destination_title', 'Location')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('target_quantity', 'Estimated Time')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>list</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Project Line', 'Project Line')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">1</select>
-          <selection_name>project_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>listbox</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_target_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/PublicationWorkflow_validate.form b/product/ERP5/skins/erp5_crm/PublicationWorkflow_validate.form
deleted file mode 100755
index f2cd4a1426f0917a0cd7293c7223efdd23be6a84..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/PublicationWorkflow_validate.form
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Offer Sale</title>
-  <row_length>4</row_length>
-  <name>SaleOpportunityWorkflow_offer</name>
-  <pt>form_view_dialog</pt>
-  <action>Workflow_statusModify</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_comment</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>Comment</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_workflow_action</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>offer</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>workflow_action</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityList.form b/product/ERP5/skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityList.form
deleted file mode 100755
index 26f9c089214f710efbc560d1dd942b8228708393..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/SaleOpportunityModule_viewSaleOpportunityList.form
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Opportunity</title>
-  <row_length>4</row_length>
-  <name>SaleOpportunityModule_viewSaleOpportunityList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[('Title', 'Title'), ('Description', 'Description'), ('opportunity_state', 'State')]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('Title', 'Title'), ('Description', 'Description'), ('opportunity_state', 'State')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('Title', "''"), ('sale_state', "''"), ('Description', "''")]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_cookie>PERSON_LIST</list_cookie>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Sale Opportunity', 'Sale Opportunity')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>sale_opportunity_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Sale Opportunity List</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/SaleOpportunityWorkflow_enquire.form b/product/ERP5/skins/erp5_crm/SaleOpportunityWorkflow_enquire.form
deleted file mode 100755
index e1a7eac53b684ca959f5715a6635ecc87f56a9c4..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/SaleOpportunityWorkflow_enquire.form
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Offer Sale</title>
-  <row_length>4</row_length>
-  <name>SaleOpportunityWorkflow_enquire</name>
-  <pt>form_view_dialog</pt>
-  <action>Workflow_statusModify</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_comment</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>Comment</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_workflow_action</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>enquire</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>workflow_action</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/SaleOpportunityWorkflow_offer.form b/product/ERP5/skins/erp5_crm/SaleOpportunityWorkflow_offer.form
deleted file mode 100755
index f2cd4a1426f0917a0cd7293c7223efdd23be6a84..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/SaleOpportunityWorkflow_offer.form
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Offer Sale</title>
-  <row_length>4</row_length>
-  <name>SaleOpportunityWorkflow_offer</name>
-  <pt>form_view_dialog</pt>
-  <action>Workflow_statusModify</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_comment</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>Comment</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_workflow_action</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>offer</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>workflow_action</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/SaleOpportunityWorkflow_reset.form b/product/ERP5/skins/erp5_crm/SaleOpportunityWorkflow_reset.form
deleted file mode 100755
index 3667ea1d7d21dcca0f01de235c2e4baaa7d3690a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/SaleOpportunityWorkflow_reset.form
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Offer Sale</title>
-  <row_length>4</row_length>
-  <name>SaleOpportunityWorkflow_reset</name>
-  <pt>form_view_dialog</pt>
-  <action>Workflow_statusModify</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_comment</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>Comment</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_workflow_action</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>reset</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>workflow_action</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/SaleOpportunity_view.form b/product/ERP5/skins/erp5_crm/SaleOpportunity_view.form
deleted file mode 100755
index d2b43cebd8c696754c59ede70f7de9c849cd482d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/SaleOpportunity_view.form
+++ /dev/null
@@ -1,340 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Opportunity</title>
-  <row_length>4</row_length>
-  <name>General</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/id</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Usual Name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/Title</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_target_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Target Budget</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Sold Price</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>opportunity_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'opportunity_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_client_person_title_list</id> <type>MultiRelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>client</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <default_module>person</default_module>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <portal_type type="list">[('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Client persons</title>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>here/getClientPersonTitleList</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_client_organisation_title_list</id> <type>MultiRelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>client</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Client organisations</title>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>here/getClientOrganisationTitleList</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Comments</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">100</width>
-        </values>
-        <tales>
-          <default>here/Description</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[('id', 'id'), ('portal_type', 'Type'), ('Title', 'Title')]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('portal_type', 'Type'), ('Title', 'Title')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_cookie>CONTACT_LIST</list_cookie>
-          <list_method type="method">getFollowUpRelatedValueList</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">0</select>
-          <selection_name>contact_list_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Contacts</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/SupportRequestModule_viewSupportRequestList.form b/product/ERP5/skins/erp5_crm/SupportRequestModule_viewSupportRequestList.form
deleted file mode 100755
index c83da3904ac0bf5323542183f4e5cdb6afd03470..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/SupportRequestModule_viewSupportRequestList.form
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Support Request</title>
-  <row_length>4</row_length>
-  <name>SupportRequestModule_viewSupportRequestList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[('Description', 'Description')]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('Title', 'Title'), ('sale_state', 'State'), ('Description', 'Description')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('Title', "''"), ('sale_state', "''"), ('Description', "''")]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_cookie>PERSON_LIST</list_cookie>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Support Request', 'Support Request')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>support_request_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Support Request List</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/SupportRequest_view.form b/product/ERP5/skins/erp5_crm/SupportRequest_view.form
deleted file mode 100755
index 91cf4a0ded9ee43d2f4f3691e33cf622cf616005..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/SupportRequest_view.form
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Support Request</title>
-  <row_length>4</row_length>
-  <name>General</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>ID</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/id</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">30</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Usual Name</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/Title</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Right</title>
-      <fields>
-
-      <field><id>my_client_person_title_list</id> <type>MultiRelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>client</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <default_module>person</default_module>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <portal_type type="list">[('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Client persons</title>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>here/getClientPersonTitleList</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_client_organisation_title_list</id> <type>MultiRelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>client</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Client organisations</title>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>here/getClientOrganisationTitleList</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>Middle</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Comments</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">100</width>
-        </values>
-        <tales>
-          <default>here/Description</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[('id', 'id'), ('portal_type', 'Type'), ('Title', 'Title')]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('portal_type', 'Type'), ('Title', 'Title')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <global_attributes type="list">[]</global_attributes>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_cookie>CONTACT_LIST</list_cookie>
-          <list_method type="method">getFollowUpRelatedValueList</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <reverse type="int">0</reverse>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">0</select>
-          <selection_name>contact_list_selection</selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Contacts</title>
-          <url_columns></url_columns>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_crm/person_emails_report.dtml b/product/ERP5/skins/erp5_crm/person_emails_report.dtml
deleted file mode 100755
index 51247399df19b3a44f156a9f364a4348cbce7b31..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/person_emails_report.dtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<dtml-in "search_in_category(category_list=['role/%s' % role], portal_type='Email')"><dtml-if "getObject().getDefaultRegion() == region">
-<dtml-var "getObject().getUrlString()">
-</dtml-if>
-</dtml-in>
diff --git a/product/ERP5/skins/erp5_crm/person_search_phone.dtml b/product/ERP5/skins/erp5_crm/person_search_phone.dtml
deleted file mode 100755
index f152124e5d1366830f8f2f55e99d4eb2c493ad94..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_crm/person_search_phone.dtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<params>select_columns
-sort_on
-Description
-id
-Title</params>
-<dtml-if sort_on>
-SELECT DISTINCT <dtml-var select_columns> FROM catalog as catalog, catalog as phone, roles_and_users WHERE catalog.uid=phone.parent_uid AND catalog.uid=roles_and_users.uid AND catalog.portal_type='Person' ORDER BY <dtml-var sort_on>
-<dtml-else>
-SELECT DISTINCT <dtml-var select_columns> FROM catalog as catalog, catalog as phone, roles_and_users WHERE catalog.uid=phone.parent_uid AND catalog.uid=roles_and_users.uid AND catalog.portal_type='Person'
-</dtml-if>
diff --git a/product/ERP5/skins/erp5_generator/createAccountingModule.py b/product/ERP5/skins/erp5_generator/createAccountingModule.py
deleted file mode 100755
index 4239b6dd9aacef66aa5134fda30f99ae7d21c955..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_generator/createAccountingModule.py
+++ /dev/null
@@ -1,9 +0,0 @@
-context.portal_types.constructContent(type_name= 'Account Module',
-                                      container=context,
-                                      id='account',
-                                      title='Accounts')
-context.portal_types.constructContent(type_name= 'Accounting Transaction Module',
-                                      container=context,
-                                      id='accounting',
-                                      title='Accounting Transactions')
-
diff --git a/product/ERP5/skins/erp5_generator/createSupplyModule.py b/product/ERP5/skins/erp5_generator/createSupplyModule.py
deleted file mode 100755
index d5d423fb3f3ac2f8d9bb6da779322786c18fef9a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_generator/createSupplyModule.py
+++ /dev/null
@@ -1,3 +0,0 @@
-context.portal_types.constructContent(type_name='Supply Module',
-                        container=context,
-                        id='supply')
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_html_style/breadcrumb.pt b/product/ERP5/skins/erp5_html_style/breadcrumb.pt
deleted file mode 100755
index 9d65f50875c5ac4fc0861bf07de3ce84b2486719..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/breadcrumb.pt
+++ /dev/null
@@ -1,76 +0,0 @@
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n">
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by breadcrumb" />
-    <title tal:content="template/title" i18n:translate="" i18n:domain="ui">The title</title>
-  </head>
-  <body>
-    <div metal:define-macro="small_breadcrumb">
-    <table width="100%">
-      <tr>
-        <td nowrap align="left">
-          <span tal:repeat="item here/breadcrumbs">
-            <a href="url goes here"
-               i18n:translate="" i18n:domain="content"
-               tal:attributes="href python:'%s/view' % item ['url']"
-               tal:content="item/title | item/id">
-              title
-            </a>&nbsp;/&nbsp;
-          </span>
-        </td>
-        <td align="right" />
-      </tr>
-    </table>
-    </div>
-    <div metal:define-macro="full_breadcrumb">
-      <table width="100%">
-        <tr>
-          <td nowrap align="left">
-            <span tal:repeat="item here/breadcrumbs">
-              <a href="url goes here"
-                i18n:translate="" i18n:domain="content"
-                tal:attributes="href python:'%s/view' % item ['url']"
-                tal:content="item/title | item/id">
-                title
-              </a>&nbsp;/&nbsp;
-            </span>
-          </td>
-          <td align="right"
-              tal:condition="python: not here.portal_membership.isAnonymousUser()">
-            &nbsp;
-            <a href="undo_form" i18n:translate="" i18n:domain="ui">Created by</a> :
-            <tal:block tal:replace="python:here.getOwnerInfo()['id']" />
-            -
-            <tal:block tal:replace="here/bobobase_modification_time" />
-          </td>
-          <td align="right"
-              tal:condition="python: here.portal_membership.isAnonymousUser()">
-            &nbsp;
-          </td>
-        </tr>
-      </table>
-    </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/cacheable_navigation_box.pt b/product/ERP5/skins/erp5_html_style/cacheable_navigation_box.pt
deleted file mode 100755
index c02a20ed144f73b1331bd39d74184a55e4def0cd..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/cacheable_navigation_box.pt
+++ /dev/null
@@ -1,2 +0,0 @@
-<div metal:use-macro="here/navigation_box/macros/navigation_box"
-              >Navigation Box</div>
diff --git a/product/ERP5/skins/erp5_html_style/dialog_master.pt b/product/ERP5/skins/erp5_html_style/dialog_master.pt
deleted file mode 100755
index d4270ced481984ca8e4a743a0b6f27eb4c8e050d..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/dialog_master.pt
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-     Thierry Faucher  <tf@nexedi.com>
-     Jean-Paul Smets  <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
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-    xml:lang="en"
-    xmlns:tal="http://xml.zope.org/namespaces/tal"
-    xmlns:metal="http://xml.zope.org/namespaces/metal"
-    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-    metal:define-macro="master">
-
-  <script language="JavaScript" src="erp5.js"
-          tal:attributes="src python:'%s/erp5.js' % here.portal_url()">
-  </script>
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by dialog_master" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-    <link href="erp5.css" rel="stylesheet" type="text/css"
-         tal:attributes="href python: here.portal_url() + '/' + 'erp5.css'" />
-  </head>
-
-  <body>
-  <form action="Test" method="POST" id="main_form"
-      tal:attributes="action here/absolute_url;
-                      method form/method | nothing;
-                      enctype form/enctype | nothing"
-      tal:define="selection_name request/selection_name | string:">
-    <div metal:use-macro="here/global_definition/macros/global_definition" />
-    <input type="hidden" name="form_id" value="form"
-       tal:attributes="value request/form_id">
-    <input type="hidden" name="dialog_id" value="form"
-       tal:attributes="value form/id">
-    <span tal:condition="request/pickle_string | nothing">
-    <input type="hidden" name="pickle_string" value="form"
-       tal:attributes="value request/pickle_string">
-    </span>
-    <input type="hidden" name="selection_name" value="selection_name"
-              tal:attributes="value selection_name">
-    <!-- Menu Boxes -->
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
-      <tr>
-        <td>
-          <!-- Navigation Box Goes Here -->
-          <div class="NavigationBox">
-            <div metal:use-macro="here/navigation_box/macros/navigation_box"
-              >Navigation Box</div>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <!-- Menu Box Goes Here -->
-
-          <div class="MenuBox">
-            <!--<div metal:use-macro="here/list_menu_box/macros/list_menu_box"
-              >MenuBox</div> -->
-          </div>
-        </td>
-      </tr>
-    </table>
-    <!-- Breadcrumb, owner and date-->
-    <div class="Breadcrumb">
-      <div metal:use-macro="here/breadcrumb/macros/small_breadcrumb"
-        >Breadcrumb</div>
-    </div>
-    <!-- Optional Portal Status Message -->
-    <div class="Main"
-       tal:condition="request/portal_status_message | nothing">
-     <table>
-       <tr>
-         <td class="error"
-             i18n:translate="" i18n:domain="ui"
-             tal:content="request/portal_status_message">
-         </td>
-       </tr>
-     </table>
-    </div>
-    <!-- Main Zone -->
-    <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <div class="OutMain">
-          <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img" tal:attributes="src string:$portal_url/images/spacer.png" /></td>
-        </div>
-        <td>
-          <!-- Main Content -->
-          <div class="Main">
-            <div metal:define-slot="main">Main Content</div>
-          </div>
-        </td>
-        <div class="OutMain">
-          <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-              border="0" tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        </div>
-      </tr>
-      <tr>
-        <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img" tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        <td></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img" tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        <td align="left"
-          tal:define="cancel_url request/cancel_url | request/HTTP_REFERER;
-                      previous_form_id request/previous_form_id | nothing">
-          <img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img" tal:attributes="src string:$portal_url/images/spacer.png"/>
-          <input type="hidden" name="dialog_method" value="cancel_url"
-                tal:attributes="value python: form.action"/>
-          <input type="hidden" name="cancel_url" value="cancel_url"
-                tal:attributes="value cancel_url">
-          <input type="hidden" name="previous_form_id" value="previous_form_id"
-                tal:attributes="value previous_form_id">
-          <input type="Submit"  value="Cancel" name="Base_cancel:method"
-                i18n:attributes="value" i18n:domain="ui"
-                />&nbsp;
-          <span tal:condition="python: form.update_action!=''">
-          <input type="hidden" name="update_method" value="cancel_url"
-                tal:attributes="value python: form.update_action"/>
-          <input type="Submit"  value="Update"
-                i18n:attributes="value" i18n:domain="ui"
-                name="Base_showUpdateDialog:method"/>
-          </span>
-          <input type="Submit"  value="Search"
-                name="Base_callDialogMethod:method"
-                tal:attributes="value form/title"/>
-        </td>
-        <td></td>
-      </tr>
-    </table>
-  </form>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/erp5.css.dtml b/product/ERP5/skins/erp5_html_style/erp5.css.dtml
deleted file mode 100755
index 18cc1a79aac3b70c8c81a140b8aeddb21304f7e6..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/erp5.css.dtml
+++ /dev/null
@@ -1,470 +0,0 @@
-<dtml-with erp5_stylesheet_properties>
-
-/*______________           CSS ERP5-CORAMY          _________________ */
-
-
-
-A:link {
- color: #002e3f;
- text-decoration: none;
-}
-
-A:visited {
- color: #002e3f;
- text-decoration: none;
-}
-
-A:hover {
- color:  &dtml-default_font_color;;
- text-decoration: underline;
-}
-
-
-BODY {
- background-color: &dtml-default_background_color;;
- margin: 0px;
- padding:0px;
- font-family: &dtml-default_font_family;;
- font-size: &dtml-default_font_size;;
- line-height: &dtml-default_font_size;;
- text-decoration: none;
- font-style: normal;
- color: &dtml-default_font_color;;
-}
-
-TH {
- vertical-align: middle;
-}
-
-TD{
-/* vertical-align: middle;*/
- align: center;
- }
-
-TD.top{
- vertical-align: top;
-}
-
-IMG{
- border: none;
-}
-
-TABLE.px{
- padding: 2px;
- margin: 2px;
-}
-
-/*   _________________ Navigation Box _________________ */
-
-.NavigationBox{
- color:  &dtml-alternate_font_color;;
- background-color: &dtml-navigation_background_color;;
- vertical-align: middle;
-
-}
-
-.NavigationBox select{
- color:  &dtml-alternate_font_color;;
- vertical-align: middle;
- font-family:  &dtml-default_font_family;;
-}
-
-.input_image{
- border:none;
- background-color=transparent;
- color=transparent;
- }
-
-
-/*   _________________ Menu Box _________________ */
-
-.MenuBox{
- color:  &dtml-alternate_font_color;;
- background-color: &dtml-menu_background_color;;
- border-color: &dtml-alternate_border_color;;
- border-style: solid;
- border-bottom-width: 1px;
- border-left-width: 0px;
- border-top-width: 0px;
- border-right-width: 0px;
- vertical-align: middle;
-
- padding-top: 2px;
- padding-right: 0px;
- padding-bottom: 2px;
- padding-left: 0px;
- }
-
-.MenuBox select{
- color:  &dtml-alternate_font_color;;
- vertical-align: middle;
- font-family:  &dtml-default_font_family;;
- }
-
-
-/*   _________________ Breadcrumb, Owner, Date _________________ */
-
-.Breadcrumb{
- color:  &dtml-default_font_color;;
- line-height: 23px;
- vertical-align: middle;
- }
-
-/*   _________________ Step _________________ */
-
-.Step{
- color:  &dtml-default_font_color;;
- color-border:  &dtml-default_font_color;;
- border-style: solid;
- border-bottom-width: 0px;
- border-left-width: 1px;
- border-top-width: 1px;
- border-right-width: 1px;
-}
-
-
-.previous{
- border-color: &dtml-alternate_border_color;;
- border-style: solid;
- border-top-width: 1px;
- border-left-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
-}
-
-.actual{
- border-color: &dtml-main_border_color;;
- border-style: solid;
- border-top-width: 2px;
- border-left-width: 2px;
- border-right-width: 2px;
- border-bottom-width: 2px;
-}
-
-.next{
- border-color:  &dtml-alternate_font_color;;
- border-style: solid;
- border-top-width: 1px;
- border-left-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
-}
-
-
-/*   _________________ Main _________________ */
-
-.Main{
-
-}
-
-.Search{
-
-}
-
-.OutMain{
- background-color:  &dtml-default_background_color;;
-}
-
-
-
-/*   _________________ Main Content  _________________ */
-
-.MainContent{
- background-color: &dtml-main_background_color;;
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 0px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- /*margin: 2px;*/
- padding: 2px;
-}
-
-.Main table.Border{
- width: 98%;
- font-style: italic;
- background-color: &dtml-main_background_color;;
- border-color: dtml-main_border_color;;
- border-style: solid;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- margin-right: 0,1em;
- margin-left: 5px;
- margin-top: 5px;
- margin-bottom: 5px;
- /*padding-left: 5px;
- padding-right: 5px;
- padding-top: 5px;
- padding-bottom: 5px;*/
-}
-
-.Main td.required{
- font-weight: bold;
-}
-
-.Main td.error{
- color: red;
-}
-
-.Main td.reqerror{
- font-weight: bold;
- color: red;
-}
-
-.Main input{
-}
-
-.input submit{
-color:  &dtml-default_font_color;;
-}
-
-.Main select{
-}
-
-/*   _________________ Search Content  _________________ */
-
-.Search table.Border{
- width: 98%;
- font-style: italic;
- background-color: &dtml-search_background_color;;
- border-color: dtml-main_border_color;;
- border-style: solid;
- border-top-width: 1px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 1px;
- margin-right: 0,1em;
- margin-left: 5px;
- margin-top: 5px;
- margin-bottom: 5px;
- /*padding-left: 5px;
- padding-right: 5px;
- padding-top: 5px;
- padding-bottom: 5px;*/
-}
-
-
-/*   _________________ ListSummary _________________ */
-
-.ListSummary{
- background-color: &dtml-main_background_color;;
- color:  &dtml-default_font_color;;
-}
-
-.ListSummary table{
- width: 98%;
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-right-width: 1px;
- border-bottom-width: 0px;
- border-left-width: 0px;
- border-top-width: 0px;
- margin-left: 5px;
- margin-top: 5px;
-}
-
-.ListSummary td.Top{
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 1px;
- border-right-width: 0px;
- border-bottom-width: 0px;
- border-left-width: 0px;
-}
-
-.ListSummary td.Left{
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 0px;
- border-right-width: 0px;
- border-bottom-width: 0px;
- border-left-width: 1px;
-}
-
-.ListSummary select{
- color:  &dtml-default_font_color;;
- margin: 3px;
-}
-
-
-/*   _________________ ListContent _________________ */
-
-.ListContent{
- /*background-color: &dtml-main_background_color;;*/
- color: #668b9b;
-}
-
-.ListContent table{
- width: 98%;
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 0px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 0px;
- margin-left: 5px;
-}
-
-.ListContent td.Data{
- font-size: 0,8em;
- color:  &dtml-default_font_color;;
- background-color: #c1dad2;
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 1px;
- border-left-width: 1px;
- border-right-width: 0px;
- border-bottom-width: 0px;
-}
-
-.ListContent td.DataA{
- font-size: 0,8em;
- background-color: #ffffff;
- color: #000000;
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 0px;
- border-left-width: 1px;
- border-right-width: 0px;
- border-bottom-width: 0px;
-}
-
-.ListContent td.DataB{
- font-size: 0,8em;
- background-color: inherit;
- color: #000000;
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 0px;
- border-left-width: 1px;
- border-right-width: 0px;
- border-bottom-width: 0px;
-}
-
-.ListContent td.DataAError{
- font-size: 0,8em;
- background-color: #ffffff;
- color: red;
- border-color: red;
- border-style: solid;
- border-top-width: 2px;
- border-left-width: 2px;
- border-right-width: 2px;
- border-bottom-width: 2px;
-}
-
-.ListContent td.DataBError{
- font-size: 0,8em;
- background-color: inherit;
- color: red;
- border-color:  red;
- border-style: solid;
- border-top-width: 2px;
- border-left-width: 2px;
- border-right-width: 2px;
- border-bottom-width: 2px;
-}
-
-/*   _________________ ViewSelectionBox _________________ */
-
-
-td.BorderTop{
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 1px;
- border-right-width: 0px;
- border-bottom-width: 0px;
- border-left-width: 0px;
-}
-
-td.BorderLeft{
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 0px;
- border-right-width: 0px;
- border-bottom-width: 0px;
- border-left-width: 1px;
-}
-
-td.BorderRightBottom{
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 0px;
- border-right-width: 1px;
- border-bottom-width: 1px;
- border-left-width: 0px;
-}
-
-td.BorderRight{
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 0px;
- border-right-width: 1px;
- border-bottom-width: 0px;
- border-left-width: 0px;
-}
-
-td.BorderLeftBottom{
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 0px;
- border-right-width: 0px;
- border-bottom-width: 1px;
- border-left-width: 1px;
-}
-
-td.BorderBottom{
-
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 0px;
- border-right-width: 0px;
- border-bottom-width: 1px;
- border-left-width: 0px;
-}
-
-td.On{
- font-weight: bold;
-}
-
-td.Off{
- border-color:  &dtml-default_font_color;;
- border-style: solid;
- border-top-width: 0px;
- border-right-width: 0px;
- border-bottom-width: 1px;
- border-left-width: 0px;
-}
-
-/*   _________________ Charts _________________ */
-
-.ChartContent table{
- width: 100%;
- align: center;
-}
-
-.ChartContent td{
- align: center;
-}
-
-.ChartContent img{
- align: center;
-}
-
-/*   _________________ Front Page _________________ */
-
-td.ModuleShortcut p{
- margin: 3px;
- padding:3px;
- font-family: &dtml-default_font_family;;
- font-size: &dtml-default_font_size;;
- line-height: &dtml-default_font_size;;
- text-decoration: none;
- font-style: normal;
-}
-
-</dtml-with>
-
diff --git a/product/ERP5/skins/erp5_html_style/erp5.js.dtml b/product/ERP5/skins/erp5_html_style/erp5.js.dtml
deleted file mode 100755
index 3448bff6c37bd0519c593db8f5b2dca731253af2..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/erp5.js.dtml
+++ /dev/null
@@ -1,8 +0,0 @@
-function submitAction(formulaire,act) {
-//alert(formulaire.module_select.options[formulaire.module_select.selectedIndex].value);
-formulaire.action = act;
-formulaire.submit();
-}
-
-
-
diff --git a/product/ERP5/skins/erp5_html_style/erp5_logo.png b/product/ERP5/skins/erp5_html_style/erp5_logo.png
deleted file mode 100755
index 6d092b278b8081c55d2a034908225957b9d2d7d8..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/erp5_logo.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/erp5_stylesheet_properties.props b/product/ERP5/skins/erp5_html_style/erp5_stylesheet_properties.props
deleted file mode 100755
index 4cf39d6e70a32fb21e45b1e0315135e8d7871371..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/erp5_stylesheet_properties.props
+++ /dev/null
@@ -1,11 +0,0 @@
-default_font_family:string=Arial, Helvetica, sans-serif
-default_font_size:string=12px
-default_font_color:string=#3D7474
-default_background_color:string=#dae6e6
-alternate_font_color:string=#597d9b
-navigation_background_color:string=#97b0c1
-menu_background_color:string=#bdd0e0
-alternate_border_color:string=#7b9ebb
-main_background_color:string=#D3E6DE
-search_background_color:string=#bdd0e0
-main_border_color:string=#7EC1C1
diff --git a/product/ERP5/skins/erp5_html_style/form_create_relation_dialog.pt b/product/ERP5/skins/erp5_html_style/form_create_relation_dialog.pt
deleted file mode 100755
index 063cc98110ced81784664fa984c2b4348d1a66ab..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/form_create_relation_dialog.pt
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-    xml:lang="en"
-    xmlns:tal="http://xml.zope.org/namespaces/tal"
-    xmlns:metal="http://xml.zope.org/namespaces/metal"
-    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-    metal:use-macro="here/list_dialog_master/macros/master">
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-      <meta name="description" content="Generated by form_create_relation_dialog" />
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-      <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Search">
-
-
-<span tal:define="groups python: form.get_groups(include_empty=1);
-                  field_errors python: request.get('field_errors',{});
-                  dummy python: request.set('here',here)">
-      <table width="100%">
-        <tr>
-          <td i18n:translate="" i18n:domain="ui">
-              There is no such document in the database. You may create
-              an new document of type <b tal:content="request/portal_type" i18n:name="portal_type">protal type</b>
-              in relation with <b tal:content="here/getTitle" i18n:name="title">title</b>
-              according to relation <b tal:content="request/base_category" i18n:name="base_category">base category</b>.
-              Use the form bellow to enter the <b tal:content="request/catalog_index" i18n:name="catalog_index">catalog index</b>
-              values of new documents.
-          </td>
-        </tr>
-
-        <span tal:repeat="field python:form.get_fields_in_group(groups[0])">
-        <tr>
-          <td tal:define="value python:request.get(field.id,None)">
-            <span tal:replace="structure python:field.render(value,request)" />
-          </td>
-        </tr>
-        <tr tal:condition="python: field_errors.has_key(field.id)">
-          <td tal:content="python: field_errors[field.id].error_text"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-        </tr>
-        </span>
-      </table>
-
-
-</span>
-
-      <input type="hidden" name="base_category" value="" tal:attributes="value request/base_category">
-      <input type="hidden" name="selection_index" value="" tal:attributes="value request/selection_index">
-      <input type="hidden" name="object_uid" value="" tal:attributes="value request/object_uid">
-      <input type="hidden" name="catalog_index" value="" tal:attributes="value request/catalog_index">
-      <input type="hidden" name="portal_type" value="" tal:attributes="value request/portal_type">
-      <input type="hidden" name="default_module" value="" tal:attributes="value request/default_module">
-
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/form_dialog.pt b/product/ERP5/skins/erp5_html_style/form_dialog.pt
deleted file mode 100755
index cb5700d04f2be6bb1d87b9af46f8b27f9a33a70c..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/form_dialog.pt
+++ /dev/null
@@ -1,233 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-    xml:lang="en"
-    xmlns:tal="http://xml.zope.org/namespaces/tal"
-    xmlns:metal="http://xml.zope.org/namespaces/metal"
-    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-    metal:use-macro="here/dialog_master/macros/master">
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-      <meta name="description" content="Generated by form_dialog" />
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-      <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Search">
-
-
-<span tal:define="groups python: form.get_groups(include_empty=1);
-                  field_errors python: request.get('field_errors',{});
-                  params python: here.portal_selections.getSelectionParams(selection_name, REQUEST=request);
-                  dummy python: request.set('here',here)">
-  <table class="Border" width="100%">
-    <tr>
-      <td>
-        <table>
-          <tr>
-            <td i18n:translate="" i18n:domain="ui">Select:</td>
-            <td valign="middle" align="right" nowrap
-                tal:define="dialog_category request/dialog_category;
-                            actions python:filtered_actions[dialog_category]">
-              <input type="hidden" name="dialog_category" value="dialog_category"
-                 tal:attributes="value dialog_category" />
-              <select name="dialog_select" size="1"
-                tal:attributes="onChange string:submitAction(form.this,'${here/absolute_url}/Base_doDialog')">
-                <span tal:repeat="action actions">
-                 <option value="1" tal:content="action/name"
-                   tal:condition="python: action['url'].find(form.id) < 0"
-                   i18n:translate="" i18n:domain="ui"
-                   tal:attributes="value action/url">Saut</option>
-                 <option value="1" tal:content="action/name"
-                   tal:condition="python: action['url'].find(form.id) >= 0"
-                   i18n:translate="" i18n:domain="ui"
-                   tal:attributes="value action/url"
-                   selected>Saut</option>
-                </span>
-              </select></td>
-            <td valign="bottom" align="left" nowrap> &nbsp;
-              <input type="image" src="/images/pro/images/exec16.png" title="Action"
-                alt="Action" name="Base_doDialog:method"
-                i18n:attributes="title" i18n:domain="ui"
-                tal:attributes="src string:$portal_url/images/exec16.png"/> &nbsp;
-            </td>
-          </tr>
-        </table>
-      </td>
-      <td valign="top" tal:condition="python: len(groups)>1"></td>
-    </tr>
-    <tr><td valign="top">
-      <table>
-        <span tal:repeat="field python:form.get_fields_in_group(groups[0])">
-        <tr>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              >
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="reqerror">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="required">
-          </td>
-          <td tal:define="value python:request.get(field.id,None) or params.get(field.id.startswith('my_') and field.id[3:] or field.id,None)">
-            <span tal:replace="structure python:field.render(value,request)" />
-          </td>
-        </tr>
-        <tr tal:condition="python: field_errors.has_key(field.id)">
-          <td>
-          </td>
-          <td tal:content="python: field_errors[field.id].error_text"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-        </tr>
-        </span>
-      </table>
-    </td>
-    <td valign="top" tal:condition="python: len(groups)>1">
-      <table>
-        <span tal:repeat="field python:form.get_fields_in_group(groups[1])">
-        <tr>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              >
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="reqerror">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="required">
-          </td>
-          <td tal:define="value python:request.get(field.id,None) or params.get(field.id.startswith('my_') and field.id[3:] or field.id,None)">
-            <span tal:replace="structure python:field.render(value,request)" />
-          </td>
-        </tr>
-        <tr tal:condition="python: field_errors.has_key(field.id)">
-          <td>
-          </td>
-          <td tal:content="python: field_errors[field.id].error_text"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-        </tr>
-        </span>
-      </table>
-    </td></tr>
-  </table>
-
-  <span tal:condition="python: len(groups)>2">
-  <table class="Border" tal:condition="python: len(form.get_fields_in_group(groups[2]))>0">
-  <td>
-    <table width="100%">
-        <span tal:repeat="field python:form.get_fields_in_group(groups[2])">
-          <tr>
-           <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-           </td>
-           <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              >
-           </td>
-           <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="reqerror">
-           </td>
-           <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="required">
-           </td>
-          </tr>
-          <tr>
-          <td tal:define="value python:request.get(field.id,None) or params.get(field.id.startswith('my_') and field.id[3:] or field.id,None)">
-             <span tal:replace="structure python:field.render(value,request)"/>
-            </td>
-          </tr>
-          <tr tal:condition="python: field_errors.has_key(field.id)">
-            <td tal:content="python: field_errors[field.id].error_text"
-                i18n:translate="" i18n:domain="ui"
-                class="error">
-            </td>
-          </tr>
-        </span>
-     </table>
-  </td>
-  </table>
-  </span>
-
-  <span tal:condition="python: len(groups)>3">
-    <span tal:repeat="field python:form.get_fields_in_group(groups[3])">
-      <span tal:define="value python:request.get(field.id,None) or params.get(field.id.startswith('my_') and field.id[3:] or field.id,None)"
-        tal:replace="structure python:field.render(value,request)" />
-    </span>
-  </span>
-
-
-</span>
-
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/form_folder_delete.pt b/product/ERP5/skins/erp5_html_style/form_folder_delete.pt
deleted file mode 100755
index fde491ae3581a63d3cc78630925ddeec86866b4c..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/form_folder_delete.pt
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:use-macro="here/list_dialog_master/macros/master">
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-      <meta name="description" content="Generated by form_folder_delete" />
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-      <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Search">
-
-
-<span tal:define="groups python: form.get_groups(include_empty=1);
-                  field_errors python: request.get('field_errors',{});
-                  dummy python: request.set('here',here)">
-
-      <table width="100%">
-        <span tal:repeat="field python:form.get_fields_in_group(groups[0])">
-        <tr>
-          <td tal:define="value python:request.get(field.id,None)">
-            <span tal:replace="structure python:field.render(value,request)" />
-          </td>
-        </tr>
-        <tr tal:condition="python: field_errors.has_key(field.id)">
-          <td tal:content="python: field_errors[field.id].error_text"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-        </tr>
-        </span>
-      </table>
-
-</span>
-
-      <input type="hidden" name="selection_index" value="" tal:attributes="value request/selection_index | string:">
-      <input type="hidden" name="object_uid" value="" tal:attributes="value request/object_uid">
-
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/form_list.pt b/product/ERP5/skins/erp5_html_style/form_list.pt
deleted file mode 100755
index 8c544e37b86d692ea5f3fc2b44be688a92e4806e..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/form_list.pt
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:use-macro="here/list_master/macros/master">
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-      <meta name="description" content="Generated by form_list" />
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-      <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Main">
-
-
-<span tal:define="groups python: form.get_groups(include_empty=1);
-                  field_errors python: request.get('field_errors',{});
-                  dummy python: request.set('here',here)">
-
-
-  <span tal:condition="python: len(groups)>0">
-    <span tal:repeat="field python:form.get_fields_in_group(groups[0])">
-      <span tal:define="value python:request.get(field.id,None)"
-        tal:replace="structure python:field.render(value,request)" />
-    </span>
-  </span>
-
-
-</span>
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/form_list_dialog.pt b/product/ERP5/skins/erp5_html_style/form_list_dialog.pt
deleted file mode 100755
index 12201017a81a1df6a85effda6ba249116e487c83..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/form_list_dialog.pt
+++ /dev/null
@@ -1,230 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/list_dialog_master/macros/master">
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-      <meta name="description" content="Generated by form_list_dialog" />
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-      <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Search">
-
-
-<span tal:define="groups python: form.get_groups(include_empty=1);
-                  field_errors python: request.get('field_errors',{});
-                  dummy python: request.set('here',here)">
-  <table class="Border" width="100%">
-    <tr>
-      <td>
-        <table>
-          <tr tal:condition="request/dialog_category | nothing">
-            <td i18n:translate="" i18n:domain="ui">Search Type:</td>
-            <td valign="middle" align="right" nowrap
-                tal:define="dialog_category request/dialog_category;
-                            actions python:filtered_actions[dialog_category]">
-              <input type="hidden" name="dialog_category" value="dialog_category"
-                 tal:attributes="value dialog_category" />
-              <select name="dialog_select" size="1"
-                tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/Base_doDialog')">
-                <span tal:repeat="action actions">
-                 <option value="1" tal:content="action/name"
-                   tal:condition="python: action['url'].find(form.id) < 0"
-                   i18n:translate="" i18n:domain="ui"
-                   tal:attributes="value action/url">Saut</option>
-                 <option value="1" tal:content="action/name"
-                   tal:condition="python: action['url'].find(form.id) >= 0"
-                   i18n:translate="" i18n:domain="ui"
-                   tal:attributes="value action/url"
-                   selected>Saut</option>
-                </span>
-              </select></td>
-            <td valign="bottom" align="left" nowrap> &nbsp;
-              <input type="image" src="/images/pro/images/exec16.png" title="Action"
-                alt="Action" name="Base_doDialog:method"
-                i18n:attributes="title" i18n:domain="ui"
-                tal:attributes="src string:$portal_url/images/exec16.png"/> &nbsp;
-            </td>
-          </tr>
-        </table>
-      </td>
-      <td valign="top" tal:condition="python: len(groups)>1"></td>
-    </tr>
-    <tr><td valign="top">
-      <table>
-        <span tal:repeat="field python:form.get_fields_in_group(groups[0])">
-        <tr>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              >
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="reqerror">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="required">
-          </td>
-          <td tal:define="value python:request.get(field.id,None)">
-            <span tal:replace="structure python:field.render(value,request)" />
-          </td>
-        </tr>
-        <tr tal:condition="python: field_errors.has_key(field.id)">
-          <td>
-          </td>
-          <td tal:content="python: field_errors[field.id].error_text"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-        </tr>
-        </span>
-      </table>
-    </td>
-    <td valign="top" tal:condition="python: len(groups)>1">
-      <table>
-        <span tal:repeat="field python:form.get_fields_in_group(groups[1])">
-        <tr>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              >
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="reqerror">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="required">
-          </td>
-          <td tal:define="value python:request.get(field.id,None)">
-            <span tal:replace="structure python:field.render(value,request)" />
-          </td>
-        </tr>
-        <tr tal:condition="python: field_errors.has_key(field.id)">
-          <td>
-          </td>
-          <td tal:content="python: field_errors[field.id].error_text"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-        </tr>
-        </span>
-      </table>
-    </td></tr>
-  </table>
-
-  <table class="Border" tal:condition="python: len(groups)>2">
-  <td>
-    <table width="100%">
-        <span tal:repeat="field python:form.get_fields_in_group(groups[2])">
-          <tr>
-           <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-           </td>
-           <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              >
-           </td>
-           <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="reqerror">
-           </td>
-           <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="required">
-           </td>
-          </tr>
-          <tr>
-            <td tal:define="value python:request.get(field.id,None)">
-             <span tal:replace="structure python:field.render(value,request)"/>
-            </td>
-          </tr>
-          <tr tal:condition="python: field_errors.has_key(field.id)">
-            <td tal:content="python: field_errors[field.id].error_text"
-                i18n:translate="" i18n:domain="ui"
-                class="error">
-            </td>
-          </tr>
-        </span>
-     </table>
-  </td>
-  </table>
-
-  <span tal:condition="python: len(groups)>3">
-    <span tal:repeat="field python:form.get_fields_in_group(groups[3])">
-      <span tal:define="value python:request.get(field.id,None)"
-        tal:replace="structure python:field.render(value,request)" />
-    </span>
-  </span>
-
-
-</span>
-
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/form_list_relation.pt b/product/ERP5/skins/erp5_html_style/form_list_relation.pt
deleted file mode 100755
index 0c07ffe2938d15eb18d7eee6032439a990649783..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/form_list_relation.pt
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:use-macro="here/list_dialog_master/macros/master">
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-      <meta name="description" content="Generated by form_list_relation" />
-      <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-      <title tal:content="template/title_or_id"     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
->The title</title>
-      <link href="erp5.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Search">
-
-
-<span tal:define="groups form/get_groups;
-                  field_errors python: request.get('field_errors',{});
-                  dummy python: request.set('here',here)">
-      <table width="100%">
-        <span tal:repeat="field python:form.get_fields_in_group(groups[0])">
-        <tr>
-          <td tal:define="value python:request.get(field.id,None)">
-            <span tal:replace="structure python:field.render(value,request)" />
-          </td>
-        </tr>
-        <tr tal:condition="python: field_errors.has_key(field.id)">
-          <td tal:content="python: field_errors[field.id].error_text"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-        </tr>
-        </span>
-      </table>
-
-</span>
-
-      <input type="hidden" name="selection_index" value="" tal:attributes="value request/selection_index">
-      <input type="hidden" name="object_uid" value="" tal:attributes="value request/object_uid">
-      <input type="hidden" name="field_id" value="" tal:attributes="value request/field_id">
-
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/form_list_ui.pt b/product/ERP5/skins/erp5_html_style/form_list_ui.pt
deleted file mode 100755
index a0ba2f7bd9ad7d705a2f2e27b6c27c9a496af1e2..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/form_list_ui.pt
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:use-macro="here/list_dialog_master/macros/master">
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by form_list_ui" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id"
-           i18n:translate="" i18n:domain="ui">
-      The title
-    </title>
-    <link href="erp5.css" rel="stylesheet" type="text/css" />
-  </head>
-
-  <body>
-    <div metal:fill-slot="main">
-      <div class="Search">
-        <span tal:define="field_errors python: request.get('field_errors',{});
-              form_id request/form_id;
-              base_form python:getattr(here,form_id);
-              groups base_form/get_groups;
-              default_columns python:base_form.get_fields_in_group(groups[0])[0].get_value('columns');
-              columns python:here.portal_selections.getSelectionColumns(selection_name, REQUEST=request, columns=default_columns);
-              selected_stats python:here.portal_selections.getSelectionStats(selection_name, REQUEST=request);
-              dummy python: request.set('here',here);
-              global row_index python:0;
-              global row_keys python:['None'];
-              global stats python: [' ','count','sum','max','min','avg'];
-              all_columns python:base_form.get_fields_in_group(groups[0])[0].get_value('all_columns')">
-
-          <table class="Border" width="100%">
-            <tr>
-              <td valign="top">
-                <table>
-                  <span tal:repeat="item columns">
-                    <tr tal:define="global row_index python:row_index+1;
-                        dummy python:row_keys.append(item[0])">
-                      <td>
-                        <tal:block i18n:translate="" i18n:domain="ui">Column</tal:block>
-                        <span tal:replace="row_index" />
-                      </td>
-                      <td>
-                        <select name="field_columns">
-                          <span tal:repeat="option python: [('None','None')] + all_columns">
-                            <option tal:condition="python:option[0]==item[0]"
-                                    tal:content="python: option[1]"
-                                    i18n:translate="" i18n:domain="ui"
-                                    tal:attributes="value python:option[0]"
-                                    value="None"
-                                    selected />
-                            <option tal:condition="python:option[0]!=item[0]"
-                                    tal:content="python: option[1]"
-                                    i18n:translate="" i18n:domain="ui"
-                                    tal:attributes="value python:option[0]"
-                                    value="None" />
-                          </span>
-                        </select>
-                        &nbsp;
-                        <select name="stat_columns">
-                          <span tal:repeat="stat stats">
-                            <span tal:condition="python: len(selected_stats) >= row_index and stat == selected_stats[row_index - 1]">
-                              <option tal:content="stat"
-                                      i18n:translate="" i18n:domain="ui"
-                                      tal:attributes="value stat"
-                                      value="None"
-                                      selected />
-                            </span>
-                            <span tal:condition="python: len(selected_stats) < row_index or stat != selected_stats[row_index - 1]">
-                              <option tal:content="stat"
-                                      i18n:translate="" i18n:domain="ui"
-                                      tal:attributes="value stat"
-                                      value="None" />
-                            </span>
-                          </span>
-                        </select>
-                      </td>
-                    </tr>
-                  </span>
-                  <span tal:repeat="item all_columns">
-                    <tr tal:condition="python: item[0] not in row_keys">
-                      <td tal:define="global row_index python:row_index+1">
-                        <tal:block i18n:translate="" i18n:domain="ui">Column</tal:block>
-                        <span tal:replace="row_index" />
-                      </td>
-                      <td>
-                        <select name="field_columns">
-                          <option selected
-                                  value="None"
-                                  i18n:translate="" i18n:domain="ui">
-                            None
-                          </option>
-                          <option tal:repeat="option all_columns"
-                                  tal:content="python:option[1]"
-                                  i18n:translate="" i18n:domain="ui"
-                                  tal:attributes="value python:option[0]"
-                                  value="None" />
-                        </select>
-                        &nbsp;
-                        <select name="stat_columns">
-                          <span tal:repeat="stat stats">
-                            <span tal:condition="python: len(selected_stats) >= row_index and stat == selected_stats[row_index - 1]"
-                                  tal:on-error="string: row_index">
-                              <option tal:content="stat"
-                                      i18n:translate="" i18n:domain="ui"
-                                      tal:attributes="value stat"
-                                      value="None"
-                                      selected />
-                            </span>
-                            <span tal:condition="python: len(selected_stats) < row_index or stat != selected_stats[row_index - 1]"
-                                  tal:on-error="string: row_index">
-                              <option tal:content="stat"
-                                      i18n:translate="" i18n:domain="ui"
-                                      tal:attributes="value stat"
-                                      value="None" />
-                            </span>
-                          </span>
-                        </select>
-                      </td>
-                    </tr>
-                  </span>
-                </table>
-              </td>
-            </tr>
-          </table>
-
-        </span>
-      </div>
-    </div>
-  </body>
-
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/form_sort.pt b/product/ERP5/skins/erp5_html_style/form_sort.pt
deleted file mode 100755
index 39f14502b6761996146dd2302f25302f3b1b7515..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/form_sort.pt
+++ /dev/null
@@ -1,118 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:use-macro="here/list_dialog_master/macros/master">
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by form_sort" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id"
-           i18n:translate="" i18n:domain="ui">
-      The title
-    </title>
-    <link href="erp5.css" rel="stylesheet" type="text/css" />
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Search">
-
-
-<span tal:define="groups python: form.get_groups(include_empty=1);
-                  sort_on python:here.portal_selections.getSelectionSortOrder(selection_name, REQUEST=request);
-                  dummy python: request.set('here',here);
-                  global row_index python:0;
-                  global row_keys python:['None'];
-                  form_id request/form_id;
-                  base_form python:getattr(here,form_id);
-                  groups base_form/get_groups;
-                  all_columns python:base_form.get_fields_in_group(groups[0])[0].get_value('all_columns')">
-  <table class="Border" width="100%">
-    <tr><td valign="top">
-      <table>
-        <span tal:repeat="item python:sort_on">
-        <tr tal:define="global row_index python:row_index+1;
-                        dummy python:row_keys.append(item[0])">
-          <td>
-            <tal:block i18n:translate="" i18n:domain="ui">Sort</tal:block>
-            <span tal:replace="row_index" />
-          </td>
-          <td>
-            <select name="field_sort_on">
-              <span tal:repeat="option python: [('None','None')] + all_columns">
-              <option tal:condition="python:option[0]==item[0]"
-                 tal:content="python:option[1]"
-                 i18n:translate="" i18n:domain="ui"
-                 tal:attributes="value python:option[0]"
-                 value="None"
-                 selected></option>
-              <option tal:condition="python:option[0]!=item[0]"
-                 tal:content="python:option[1]"
-                 i18n:translate="" i18n:domain="ui"
-                 tal:attributes="value python:option[0]"
-                 value="None"></option>
-              </span>
-            </select>
-          </td>
-          <td>
-            <span tal:replace="structure python:form.sort_order.render(item[1], request)" />
-          </td>
-        </tr>
-        </span>
-        <span tal:repeat="item all_columns">
-        <tr tal:condition="python: item[0] not in row_keys">
-          <td tal:define="global row_index python:row_index+1">
-            <tal:block i18n:translate="" i18n:domain="ui">Sort</tal:block>
-            <span tal:replace="row_index" />
-          </td>
-          <td>
-            <select name="field_sort_on">
-              <option selected value="None">None</option>
-              <option tal:repeat="option all_columns"
-                 tal:content="python:option[1]"
-                 i18n:translate="" i18n:domain="ui"
-                 tal:attributes="value python:option[0]"
-                 value="None"></option>
-            </select>
-          </td>
-          <td>
-            <span tal:replace="structure python:form.sort_order.render('', request)" />
-          </td>
-        </tr>
-        </span>
-    </table>
-    </td></tr>
-  </table>
-
-</span>
-
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/form_view.pt b/product/ERP5/skins/erp5_html_style/form_view.pt
deleted file mode 100755
index d9ffbb38fb3d29e0c8cc002a025fe25cf389d6d3..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/form_view.pt
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:use-macro="here/view_master/macros/master">
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by form_view" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id"
-           i18n:translate="" i18n:domain="ui">
-      The title
-    </title>
-    <link href="erp5.css" rel="stylesheet" type="text/css" />
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Main">
-
-
-<span tal:define="groups python: form.get_groups(include_empty=1);
-                  field_errors python: request.get('field_errors',{});
-                  dummy python: request.set('here',here)">
-  <table class="Border" width="100%" tal:condition="python:len(form.get_fields_in_group(groups[0])) > 0
-                                          or len(form.get_fields_in_group(groups[1])) > 0">
-    <td valign="top">
-      <table>
-        <span tal:repeat="field python:form.get_fields_in_group(groups[0])">
-        <tr tal:condition="python:field.meta_type != 'HiddenStringField'">
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              >
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="reqerror">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="required">
-          </td>
-          <td tal:define="value python:request.get(field.id,None)">
-            <span tal:replace="structure python:field.render(value,request)" />
-          </td>
-        </tr>
-        <tr tal:condition="python: field_errors.has_key(field.id)">
-          <td>
-          </td>
-          <td tal:content="python:field_errors[field.id].error_text"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-        </tr>
-        </span>
-      </table>
-    </td>
-    <td valign="top" tal:condition="python: len(groups)>1">
-      <table>
-        <span tal:repeat="field python:form.get_fields_in_group(groups[1])">
-        <tr tal:condition="python:field.meta_type != 'HiddenStringField'">
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              >
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="reqerror">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="required">
-          </td>
-          <td tal:define="value python:request.get(field.id,None)">
-            <span tal:replace="structure python:field.render(value,request)" />
-          </td>
-        </tr>
-        <tr tal:condition="python: field_errors.has_key(field.id)">
-          <td>
-          </td>
-          <td tal:content="python: field_errors[field.id].error_text"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-        </tr>
-        </span>
-      </table>
-    </td>
-  </table>
-
-  <span tal:condition="python: len(groups)>2">
-  <table class="Border" tal:condition="python:len(form.get_fields_in_group(groups[2])) > 0">
-  <td>
-    <table>
-        <span tal:repeat="field python:form.get_fields_in_group(groups[2])">
-         <tr tal:condition="python:field.meta_type != 'HiddenStringField'">
-           <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-           </td>
-           <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              >
-           </td>
-           <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="reqerror">
-           </td>
-           <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="required">
-           </td>
-            <td tal:define="value python:request.get(field.id,None)">
-             <span tal:replace="structure python:field.render(value,request)"/>
-            </td>
-          </tr>
-          <tr tal:condition="python: field_errors.has_key(field.id)">
-            <td tal:content="python: field_errors[field.id].error_text"
-                i18n:translate="" i18n:domain="ui"
-                class="error">
-            </td>
-          </tr>
-        </span>
-     </table>
-  </td>
-  </table>
-  </span>
-
-  <span tal:condition="python: len(groups)>3">
-    <span tal:repeat="field python:form.get_fields_in_group(groups[3])">
-      <span tal:define="value python:request.get(field.id,None)"
-        tal:replace="structure python:field.render(value,request)" />
-    </span>
-  </span>
-
-
-</span>
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/form_view_dialog.pt b/product/ERP5/skins/erp5_html_style/form_view_dialog.pt
deleted file mode 100755
index 7b77f9fadbdf20ca3aed800872658e25b6682c8c..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/form_view_dialog.pt
+++ /dev/null
@@ -1,234 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:use-macro="here/view_dialog_master/macros/master">
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by form_view_dialog" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id"
-           i18n:translate="" i18n:domain="ui">
-      The title
-    </title>
-    <link href="erp5.css" rel="stylesheet" type="text/css" />
-  </head>
-
-  <body><div metal:fill-slot="main">
-          <div class="Search">
-
-
-<span tal:define="groups python: form.get_groups(include_empty=1);
-                  field_errors python: request.get('field_errors',{});
-                  dummy python: request.set('here',here)">
-  <table class="Border" width="100%" tal:condition="python:len(form.get_fields_in_group(groups[0])) > 0
-                                          or len(form.get_fields_in_group(groups[1])) > 0">
-    <tr>
-      <td>
-        <table>
-          <tr tal:condition="request/dialog_category | nothing">
-            <td i18n:translate="" i18n:domain="ui">Search Type:</td>
-            <td valign="middle" align="right" nowrap
-                tal:define="dialog_category request/dialog_category;
-                            actions python:filtered_actions[dialog_category]">
-              <input type="hidden" name="dialog_category" value="dialog_category"
-                 tal:attributes="value dialog_category" />
-              <select name="dialog_select" size="1"
-                tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/Base_doDialog')">
-                <span tal:repeat="action actions">
-                 <option value="1" tal:content="action/name"
-                   tal:condition="python: action['url'].find(form.id) < 0"
-                   i18n:translate="" i18n:domain="ui"
-                   tal:attributes="value action/url">Saut</option>
-                 <option value="1" tal:content="action/name"
-                   tal:condition="python: action['url'].find(form.id) >= 0"
-                   i18n:translate="" i18n:domain="ui"
-                   tal:attributes="value action/url"
-                   selected>Saut</option>
-                </span>
-              </select></td>
-            <td valign="bottom" align="left" nowrap> &nbsp;
-              <input type="image" src="/images/pro/images/exec16.png" title="Action"
-                i18n:attributes="title" i18n:domain="ui"
-                alt="Action" name="Base_doDialog:method" /> &nbsp;
-            </td>
-          </tr>
-        </table>
-      </td>
-      <td valign="top" tal:condition="python: len(groups)>1"></td>
-    </tr>
-    <tr><td valign="top">
-      <table>
-        <span tal:repeat="field python:form.get_fields_in_group(groups[0])">
-        <tr>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              >
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="reqerror">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="required">
-          </td>
-          <td tal:define="value python:request.get(field.id,None)">
-            <span tal:replace="structure python:field.render(value,request)" />
-          </td>
-        </tr>
-        <tr tal:condition="python: field_errors.has_key(field.id)">
-          <td>
-          </td>
-          <td tal:content="python: field_errors[field.id].error_text"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-        </tr>
-        </span>
-      </table>
-    </td>
-    <td valign="top" tal:condition="python: len(groups)>1">
-      <table>
-        <span tal:repeat="field python:form.get_fields_in_group(groups[1])">
-        <tr>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              >
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="reqerror">
-          </td>
-          <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="required">
-          </td>
-          <td tal:define="value python:request.get(field.id,None)">
-            <span tal:replace="structure python:field.render(value,request)" />
-          </td>
-        </tr>
-        <tr tal:condition="python: field_errors.has_key(field.id)">
-          <td>
-          </td>
-          <td tal:content="python: field_errors[field.id].error_text"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-          </td>
-        </tr>
-        </span>
-      </table>
-    </td></tr>
-  </table>
-
-  <table class="Border" tal:condition="python: len(groups)>2 and
-                                       len(form.get_fields_in_group(groups[2])) > 0">
-  <td>
-    <table width="100%">
-        <span tal:repeat="field python:form.get_fields_in_group(groups[2])">
-          <tr>
-           <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="error">
-           </td>
-           <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and not field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              >
-           </td>
-           <td tal:content="structure field/title"
-              tal:condition="python: field_errors.has_key(field.id)
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="reqerror">
-           </td>
-           <td tal:content="structure field/title"
-              tal:condition="python: (not field_errors.has_key(field.id))
-                      and field.is_required()"
-              i18n:translate="" i18n:domain="ui"
-              class="required">
-           </td>
-          </tr>
-          <tr>
-            <td tal:define="value python:request.get(field.id,None)">
-             <span tal:replace="structure python:field.render(value,request)"/>
-            </td>
-          </tr>
-          <tr tal:condition="python: field_errors.has_key(field.id)">
-            <td tal:content="python: field_errors[field.id].error_text"
-                i18n:translate="" i18n:domain="ui"
-                class="error">
-            </td>
-          </tr>
-        </span>
-     </table>
-  </td>
-  </table>
-
-  <span tal:condition="python: len(groups)>3">
-    <span tal:repeat="field python:form.get_fields_in_group(groups[3])">
-      <span tal:define="value python:request.get(field.id,None)"
-        tal:replace="structure python:field.render(value,request)" />
-    </span>
-  </span>
-
-
-</span>
-
-          </div>
-      </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/global_definition.pt b/product/ERP5/skins/erp5_html_style/global_definition.pt
deleted file mode 100755
index 0775c9a39f3810a62a5291ddd3e7b88dfce9b39a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/global_definition.pt
+++ /dev/null
@@ -1,41 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      meta:define-macro="master">
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by global_definition" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id"
-           i18n:translate="" i18n:domain="ui">
-      The title
-    </title>
-    <link href="erp5.css" rel="stylesheet" type="text/css" />
-  </head>
-
-  <body>
-
-
-<span metal:define-macro="global_definition"
-      tal:define="global filtered_actions python:here.portal_actions.listFilteredActionsFor(here);
-                  global workflow_actions filtered_actions/workflow | nothing;
-                  global folder_actions filtered_actions/folder | nothing;
-                  global object_actions filtered_actions/object_action | nothing;
-                  global jump_actions filtered_actions/object_jump | nothing;
-                  global view_actions filtered_actions/object_view | nothing;
-                  global exchange_actions filtered_actions/object_exchange | nothing;
-                  global report_actions filtered_actions/object_report | nothing;
-                  global print_actions filtered_actions/object_print | nothing;
-                  global search_actions filtered_actions/object_search | nothing;
-                  global ui_actions filtered_actions/object_ui | nothing;
-                  global sort_actions filtered_actions/object_sort | nothing;
-                  global user_actions filtered_actions/user | nothing;
-                  global global_actions filtered_actions/global | nothing;
-                  global ordered_global_actions python:here.getOrderedGlobalActionList(global_actions);
-                  global portal_url python:here.portal_url();" />
-
-
-  </body>
-</html>
-
diff --git a/product/ERP5/skins/erp5_html_style/images/1bottomarrow.png b/product/ERP5/skins/erp5_html_style/images/1bottomarrow.png
deleted file mode 100755
index f973cc9092e24be2ba832eff965e41013bc59457..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/1bottomarrow.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/1leftarrow.png b/product/ERP5/skins/erp5_html_style/images/1leftarrow.png
deleted file mode 100755
index 022416a86a3a05ee252cc1e6c13000f0665f97f1..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/1leftarrow.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/1leftarrowb.png b/product/ERP5/skins/erp5_html_style/images/1leftarrowb.png
deleted file mode 100755
index 346a01a575b89d8c3aab8a572e36630db82eb9b8..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/1leftarrowb.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/1leftarrowv.png b/product/ERP5/skins/erp5_html_style/images/1leftarrowv.png
deleted file mode 100755
index bc8561de021a0620adc3373a1e0b6cd5a9830b01..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/1leftarrowv.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/1rightarrow.png b/product/ERP5/skins/erp5_html_style/images/1rightarrow.png
deleted file mode 100755
index 940803408cb8c92244a31962843528e4be5641a5..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/1rightarrow.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/1rightarrowb.png b/product/ERP5/skins/erp5_html_style/images/1rightarrowb.png
deleted file mode 100755
index 9f49de3e4edecd9b0220f32122f3233b4f903255..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/1rightarrowb.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/1rightarrowv.png b/product/ERP5/skins/erp5_html_style/images/1rightarrowv.png
deleted file mode 100755
index 4ecf3af68c0ee969cb97e4e59d7f47032bc658b7..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/1rightarrowv.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/1toparrow.png b/product/ERP5/skins/erp5_html_style/images/1toparrow.png
deleted file mode 100755
index 5ce97d41264d273261edfaa79d07dd9515fda437..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/1toparrow.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/2leftarrow.png b/product/ERP5/skins/erp5_html_style/images/2leftarrow.png
deleted file mode 100755
index bd24e9c632b05cadf36520e67ee06c82700b7002..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/2leftarrow.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/2leftarrowb.png b/product/ERP5/skins/erp5_html_style/images/2leftarrowb.png
deleted file mode 100755
index 1ef0b1ca4e4919817d94b7a5a74fb877036bfcf7..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/2leftarrowb.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/2rightarrow.png b/product/ERP5/skins/erp5_html_style/images/2rightarrow.png
deleted file mode 100755
index ebb829455daee3dee5e60b9a9edaaa75bb9e6491..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/2rightarrow.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/2rightarrowb.png b/product/ERP5/skins/erp5_html_style/images/2rightarrowb.png
deleted file mode 100755
index d42f93efb1ffb6a614bb9bdbf97b091444b9411b..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/2rightarrowb.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/Left.png b/product/ERP5/skins/erp5_html_style/images/Left.png
deleted file mode 100755
index c20f499b339d8568dfdd8bb8026b1fa897f4ac9b..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/Left.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/Left2.png b/product/ERP5/skins/erp5_html_style/images/Left2.png
deleted file mode 100755
index 4b8d237107378d8e46f74de41617071ba70e060c..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/Left2.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/Right.png b/product/ERP5/skins/erp5_html_style/images/Right.png
deleted file mode 100755
index 2d5a808b6f31075c3cb84be0dc310508079cd90c..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/Right.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/activity_busy.png b/product/ERP5/skins/erp5_html_style/images/activity_busy.png
deleted file mode 100755
index b777d372d1b260a0e29c22838daec1fded239bfd..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/activity_busy.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/appearance.png b/product/ERP5/skins/erp5_html_style/images/appearance.png
deleted file mode 100755
index e5063df0f1b91fc766e4f28c98d169c58a4d3fcf..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/appearance.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/boussole.png b/product/ERP5/skins/erp5_html_style/images/boussole.png
deleted file mode 100755
index 875016ca406f754f7a6dc80c72c5f42858aadfac..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/boussole.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/checkall.png b/product/ERP5/skins/erp5_html_style/images/checkall.png
deleted file mode 100755
index 3144d1a64e52673144d250c1ce7de0457248b50a..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/checkall.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/configure.png b/product/ERP5/skins/erp5_html_style/images/configure.png
deleted file mode 100755
index 07755efff8cfab0814b2eb96a3835ab2533ebc4f..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/configure.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/decheckall.png b/product/ERP5/skins/erp5_html_style/images/decheckall.png
deleted file mode 100755
index bdc81cd532ccf671e1cfc8fc4a00a01d5180503f..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/decheckall.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/deselectall.png b/product/ERP5/skins/erp5_html_style/images/deselectall.png
deleted file mode 100755
index 99a8a427648c6235c1b5e091473ea330a94335d1..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/deselectall.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/do.png b/product/ERP5/skins/erp5_html_style/images/do.png
deleted file mode 100755
index 8545626a33dfb38226394ad9d00c46ee8409d5cd..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/do.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/editcopy.png b/product/ERP5/skins/erp5_html_style/images/editcopy.png
deleted file mode 100755
index 3594c86a264298d2187113958a936a19400b13ff..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/editcopy.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/editcut.png b/product/ERP5/skins/erp5_html_style/images/editcut.png
deleted file mode 100755
index 0c8da8671ad0d88f27f742201fb4b89f5bd17955..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/editcut.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/editpaste.png b/product/ERP5/skins/erp5_html_style/images/editpaste.png
deleted file mode 100755
index 362a716494479ee372fd36e629065a3923b36526..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/editpaste.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/edittrash.png b/product/ERP5/skins/erp5_html_style/images/edittrash.png
deleted file mode 100755
index 5c365190eec053522a557d34ad1298b61326202c..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/edittrash.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/etat2.png b/product/ERP5/skins/erp5_html_style/images/etat2.png
deleted file mode 100755
index 733cbd7dc839f14e6b47cff7ada9b73b9775957f..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/etat2.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/etat3.png b/product/ERP5/skins/erp5_html_style/images/etat3.png
deleted file mode 100755
index 8c5996b631ad91b4dc39321c279db54523bf5db2..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/etat3.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/exec.png b/product/ERP5/skins/erp5_html_style/images/exec.png
deleted file mode 100755
index 3a6d7a0d2b5ac1997945b2d0e30d64ec779157f8..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/exec.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/exec16.png b/product/ERP5/skins/erp5_html_style/images/exec16.png
deleted file mode 100755
index 1c08f0caabe5ff99da9ac61db59c195411bdbdbc..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/exec16.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/favourite.png b/product/ERP5/skins/erp5_html_style/images/favourite.png
deleted file mode 100755
index 6f3d8c40b777fc2b7017777e73f2eee00f44fec6..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/favourite.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/filenew.png b/product/ERP5/skins/erp5_html_style/images/filenew.png
deleted file mode 100755
index 81d5bf4eb84807ba88918192350afd1a73ff8563..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/filenew.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/fileprint.png b/product/ERP5/skins/erp5_html_style/images/fileprint.png
deleted file mode 100755
index d96a90e809438d18252ef85da358c4a38052859b..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/fileprint.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/filter.png b/product/ERP5/skins/erp5_html_style/images/filter.png
deleted file mode 100755
index 6748d7abbc4aed83817ebe045f3bbd2d8f3c475c..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/filter.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/find.png b/product/ERP5/skins/erp5_html_style/images/find.png
deleted file mode 100755
index 20197d68d6e0e090ffca6fbf5111736aa2bc8b16..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/find.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/help.png b/product/ERP5/skins/erp5_html_style/images/help.png
deleted file mode 100755
index 90c59fbd25737da1510ee72f994eb78b81290a87..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/help.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/history.png b/product/ERP5/skins/erp5_html_style/images/history.png
deleted file mode 100755
index 46c0532f5efb73fd1f1fa3c279fe733f86b6a136..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/history.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/imp-exp.png b/product/ERP5/skins/erp5_html_style/images/imp-exp.png
deleted file mode 100755
index 2e96d166ae8e08e6c7b6b5e387df91947360e8c3..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/imp-exp.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/info.png b/product/ERP5/skins/erp5_html_style/images/info.png
deleted file mode 100755
index 3af504494b2d50721a918c780eaa51da33b78e0e..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/info.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/intranet.png b/product/ERP5/skins/erp5_html_style/images/intranet.png
deleted file mode 100755
index 98c1243dc52fecf99fc36bad9ddcae7abb05cf70..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/intranet.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/jump.png b/product/ERP5/skins/erp5_html_style/images/jump.png
deleted file mode 100755
index cf930a56d48155c80104eaae83cc91ec84663179..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/jump.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/kmago.png b/product/ERP5/skins/erp5_html_style/images/kmago.png
deleted file mode 100755
index 654ed0a292bcf7e36bbd6825d4f43db9d4be47df..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/kmago.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/language.png b/product/ERP5/skins/erp5_html_style/images/language.png
deleted file mode 100755
index f02858351a396686e2121aa9b718463824213195..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/language.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/left3.png b/product/ERP5/skins/erp5_html_style/images/left3.png
deleted file mode 100755
index 882382a330ec4f92e545a87bf157b16a7f459e81..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/left3.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/mail.png b/product/ERP5/skins/erp5_html_style/images/mail.png
deleted file mode 100755
index d1e78599fc848f979bc9689adc0478df5ff23a33..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/mail.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/ok.png b/product/ERP5/skins/erp5_html_style/images/ok.png
deleted file mode 100755
index 5e4f6ba8c23e7e8c49ebfde1eef1358596faf5be..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/ok.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/ok16.png b/product/ERP5/skins/erp5_html_style/images/ok16.png
deleted file mode 100755
index 467ec4c417a2ab8b864012152a060a348ecafb29..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/ok16.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/option1.png b/product/ERP5/skins/erp5_html_style/images/option1.png
deleted file mode 100755
index f2c6c8433f25c1f2b6d3257b6c7bb7e429533bc7..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/option1.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/option2.png b/product/ERP5/skins/erp5_html_style/images/option2.png
deleted file mode 100755
index a3ba9a44bb29cb2b9ce1a6b20a15ec8734dc66d2..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/option2.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/option3.png b/product/ERP5/skins/erp5_html_style/images/option3.png
deleted file mode 100755
index b2c652d82ca7975a255594532217c1eb7b5256f2..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/option3.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/option4.png b/product/ERP5/skins/erp5_html_style/images/option4.png
deleted file mode 100755
index bc48e974248c469b6955e56baad6981fb94d570b..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/option4.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/option5.png b/product/ERP5/skins/erp5_html_style/images/option5.png
deleted file mode 100755
index abdfc10fbddc813296fce097d5a10a4e3f17c911..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/option5.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/option6.png b/product/ERP5/skins/erp5_html_style/images/option6.png
deleted file mode 100755
index 9e06b242c765a977f37e6459d6b584b9163de2a1..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/option6.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/option7.png b/product/ERP5/skins/erp5_html_style/images/option7.png
deleted file mode 100755
index d7f7e0493ad85beda16c33dcbf878f7d35b19a9e..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/option7.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/print.png b/product/ERP5/skins/erp5_html_style/images/print.png
deleted file mode 100755
index d96a90e809438d18252ef85da358c4a38052859b..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/print.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/reload.png b/product/ERP5/skins/erp5_html_style/images/reload.png
deleted file mode 100755
index 0dc50b08c09ddedeee8d3bf5e9826212d063aa05..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/reload.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/rose.png b/product/ERP5/skins/erp5_html_style/images/rose.png
deleted file mode 100755
index 53818f7922f1005b60d9f02af15ab8bc04b80f06..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/rose.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/save.png b/product/ERP5/skins/erp5_html_style/images/save.png
deleted file mode 100755
index e5bb44cbd8591ded90b3b885a6f0143763cce167..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/save.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/save2.png b/product/ERP5/skins/erp5_html_style/images/save2.png
deleted file mode 100755
index 789f6952f390cbbf57c93bd2177de3ca9a4dbc69..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/save2.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/selectall.png b/product/ERP5/skins/erp5_html_style/images/selectall.png
deleted file mode 100755
index 1e4294854f882392cb2c16244dc89a39d821533e..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/selectall.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/sepacla.png b/product/ERP5/skins/erp5_html_style/images/sepacla.png
deleted file mode 100755
index 7c8489e381d82d9fb7dd6fb3f3fbae26b8c67269..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/sepacla.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/sepafon.png b/product/ERP5/skins/erp5_html_style/images/sepafon.png
deleted file mode 100755
index 3b0b195ba36fabf7303a9d413042df898e70956d..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/sepafon.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/spacer.png b/product/ERP5/skins/erp5_html_style/images/spacer.png
deleted file mode 100755
index aa1d7f5fc2e79220cc6c4149989c84c509add184..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/spacer.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/text_block.png b/product/ERP5/skins/erp5_html_style/images/text_block.png
deleted file mode 100755
index 904b2f849feebe7f979c7bbd2e7c9d7a1e9d412a..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/text_block.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/toutcocher b/product/ERP5/skins/erp5_html_style/images/toutcocher
deleted file mode 100755
index 1e4294854f882392cb2c16244dc89a39d821533e..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/toutcocher and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/toutdecocher b/product/ERP5/skins/erp5_html_style/images/toutdecocher
deleted file mode 100755
index 99a8a427648c6235c1b5e091473ea330a94335d1..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/toutdecocher and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/toutsel.png b/product/ERP5/skins/erp5_html_style/images/toutsel.png
deleted file mode 100755
index 18502d99173db9be4e7008456a27b494feb63f6f..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/toutsel.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/trier.png b/product/ERP5/skins/erp5_html_style/images/trier.png
deleted file mode 100755
index c4b664feccd1b5312453c78696070b43d2e77a26..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/trier.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/triorder.png b/product/ERP5/skins/erp5_html_style/images/triorder.png
deleted file mode 100755
index 5080874e8243dba894c2c0124f3fc33e4b310337..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/triorder.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/view_choose.png b/product/ERP5/skins/erp5_html_style/images/view_choose.png
deleted file mode 100755
index e66bacd6781d1d9897a2cee14a4823356ab65a01..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/view_choose.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/images/view_tree.png b/product/ERP5/skins/erp5_html_style/images/view_tree.png
deleted file mode 100755
index a256efe64c31d8f2fc6b3a60d7e9035ccffc2942..0000000000000000000000000000000000000000
Binary files a/product/ERP5/skins/erp5_html_style/images/view_tree.png and /dev/null differ
diff --git a/product/ERP5/skins/erp5_html_style/index_html.pt b/product/ERP5/skins/erp5_html_style/index_html.pt
deleted file mode 100755
index d28f930652fdd0c8c8ba67ee6be4be5a32a286f7..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/index_html.pt
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2004 Nexedi SARL and Contributors. All Rights Reserved.
-                   Yoshinori Okuji     <yo@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
- <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-  <meta name="description" content="Generated by index_html" />
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-  <link href="erp5.css" rel="stylesheet" type="text/css" />
- </head>
-
-<body style="position: relative">
-
-<div metal:fill-slot="header"
-     tal:define="global has_local python: 'local_pt' in here.objectIds();
-                 global util_macros here/index_html_utils/macros;
-                " >
-
-  <div tal:condition="not: has_local">
-
-     <div metal:use-macro="util_macros/index_header" />
-
-  </div>
-
-  <div tal:condition="has_local">
-
-    <div metal:use-macro="here/local_pt/macros/header | default">
-      'local_pt' header goes here.
-    </div>
-
-  </div>
-
-</div><!-- header slot -->
-
-<div metal:fill-slot="main">
-
-  <div id="content_well"
-       style="float: left; top: 0; width: 80%;">
-
-    <div tal:condition="not: has_local">
-
-      <br />
-
-      <div metal:use-macro="util_macros/index_content" />
-
-      <div metal:use-macro="util_macros/index_links" />
-
-      <div metal:use-macro="util_macros/index_folders" />
-
-    </div>
-
-    <div tal:condition="has_local">
-
-      <div metal:use-macro="here/local_pt/macros/body | default">
-        'local_pt' body goes here.
-      </div>
-
-    </div>
-
-  </div>
-
-</div>
-
-</body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/list_dialog_master.pt b/product/ERP5/skins/erp5_html_style/list_dialog_master.pt
deleted file mode 100755
index 8ab7d9c26aa107576c71115aae2c565416cbf03a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/list_dialog_master.pt
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-     Thierry Faucher  <tf@nexedi.com>
-     Jean-Paul Smets  <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
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:define-macro="master">
-
-  <script language="JavaScript" src="erp5.js"
-          tal:attributes="src python:'%s/erp5.js' % here.portal_url()">
-  </script>
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by list_dialog_master" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-    <link href="erp5.css" rel="stylesheet" type="text/css"
-         tal:attributes="href python: here.portal_url() + '/' + 'erp5.css'" />
-  </head>
-
-  <body>
-  <form action="Test" method="POST" id="main_form"
-      tal:attributes="action here/absolute_url;
-                      method form/method | nothing;
-                      enctype form/enctype | nothing"
-      tal:define="selection_name request/selection_name | string:">
-    <div metal:use-macro="here/global_definition/macros/global_definition" />
-    <input type="hidden" name="form_id" value="form"
-       tal:attributes="value request/form_id">
-    <input type="hidden" name="dialog_id" value="form"
-       tal:attributes="value form/id">
-    <input type="hidden" name="selection_name" value="selection_name"
-              tal:attributes="value selection_name">
-    <!-- Menu Boxes -->
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
-      <tr>
-        <td>
-          <!-- Navigation Box Goes Here -->
-          <div class="NavigationBox">
-            <div metal:use-macro="here/navigation_box/macros/navigation_box"
-              >Navigation Box</div>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <!-- Menu Box Goes Here -->
-
-          <div class="MenuBox">
-            <!--<div metal:use-macro="here/list_menu_box/macros/list_menu_box"
-              >MenuBox</div> -->
-          </div>
-        </td>
-      </tr>
-    </table>
-    <!-- Breadcrumb, owner and date-->
-    <div class="Breadcrumb">
-      <div metal:use-macro="here/breadcrumb/macros/small_breadcrumb"
-        >Breadcrumb</div>
-    </div>
-    <!-- Optional Portal Status Message -->
-    <div class="Main"
-       tal:condition="request/portal_status_message | nothing">
-     <table><tr><td class="error"
-              i18n:translate="" i18n:domain="ui"
-              tal:content="request/portal_status_message">
-              </td></tr>
-     </table>
-    </div>
-    <!-- Main Zone -->
-    <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <div class="OutMain">
-          <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img"
-            tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        </div>
-        <td>
-          <!-- Main Content -->
-          <div class="Main">
-            <div metal:define-slot="main">Main Content</div>
-          </div>
-        </td>
-        <div class="OutMain">
-          <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-              border="0"
-              tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        </div>
-      </tr>
-      <tr>
-        <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img"
-            tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        <td></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img"
-            tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        <td align="left"
-          tal:define="cancel_url request/cancel_url | request/HTTP_REFERER;
-                      previous_form_id request/previous_form_id | nothing">
-          <img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img"
-            tal:attributes="src string:$portal_url/images/spacer.png"/>
-          <input type="hidden" name="dialog_method" value="cancel_url"
-                tal:attributes="value python: form.action"/>
-          <input type="hidden" name="cancel_url" value="cancel_url"
-                tal:attributes="value cancel_url">
-          <input type="hidden" name="previous_form_id" value="previous_form_id"
-                tal:attributes="value previous_form_id">
-          <input type="Submit"  value="Cancel" name="Base_cancel:method"
-                 i18n:attributes="value" i18n:domain="ui"
-                />&nbsp;
-          <input type="Submit"  value="Search"
-                 name="Base_callListDialogMethod:method"
-                 i18n:attributes="value" i18n:domain="ui"
-                 tal:attributes="value form/title"/>
-        </td>
-        <td></td>
-      </tr>
-    </table>
-  </form>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/list_master.pt b/product/ERP5/skins/erp5_html_style/list_master.pt
deleted file mode 100755
index 73a71ffbbb6deaf6d61cf19fb7ed680565cff082..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/list_master.pt
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-     Thierry Faucher  <tf@nexedi.com>
-     Jean-Paul Smets  <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
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:define-macro="master">
-
-  <script language="JavaScript" src="erp5.js">
-  </script>
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by list_master" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-    <link href="erp5.css" rel="stylesheet" type="text/css"
-         tal:attributes="href python: here.portal_url() + '/' + 'erp5.css'" />
-  </head>
-
-  <body>
-  <form action="Test" method="POST" id="main_form"
-      tal:attributes="action here/absolute_url;
-                      method form/method | nothing;
-                      enctype form/enctype | nothing">
-    <div metal:use-macro="here/global_definition/macros/global_definition" />
-    <input type="hidden" name="form_id" value="form"
-       tal:attributes="value form/id">
-    <input type="hidden" name="is_list" value="1">
-    <!-- Menu Boxes -->
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
-      <tr>
-        <td>
-          <!-- Navigation Box Goes Here -->
-          <div class="NavigationBox">
-            <div metal:use-macro="here/navigation_box/macros/navigation_box"
-              >Navigation Box</div>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <!-- Menu Box Goes Here -->
-          <div class="MenuBox">
-            <div metal:use-macro="here/list_menu_box/macros/list_menu_box"
-              >MenuBox</div>
-          </div>
-        </td>
-      </tr>
-    </table>
-    <!-- Breadcrumb, owner and date-->
-    <div class="Breadcrumb">
-      <div metal:use-macro="here/breadcrumb/macros/full_breadcrumb"
-        >Breadcrumb</div>
-    </div>
-    <!-- Optional Portal Status Message -->
-    <div class="Main"
-       tal:condition="request/portal_status_message | nothing">
-     <table><tr><td class="error"
-                    i18n:translate="" i18n:domain="ui"
-                    tal:content="request/portal_status_message">
-              </td></tr>
-     </table>
-    </div>
-    <!-- Main Zone -->
-    <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <div class="OutMain">
-          <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img"
-            tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        </div>
-        <td>
-          <!-- Main Content -->
-          <div class="Main">
-            <div metal:define-slot="main">Main Content</div>
-          </div>
-        </td>
-        <div class="OutMain">
-          <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-              border="0"
-              tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        </div>
-      </tr>
-    </table>
-  </form>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/list_menu_box.pt b/product/ERP5/skins/erp5_html_style/list_menu_box.pt
deleted file mode 100755
index 8ec6a098b1ab20c18d857960d817812eccf2859b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/list_menu_box.pt
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                 "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-     Thierry Faucher  <tf@nexedi.com>
-     Jean-Paul Smets  <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
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      xmlns:metal="http://xml.zope.org/namespaces/metal">
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by list_menu_box" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-    <link href="erp5.css" rel="stylesheet" type="text/css" />
-  </head>
-
-  <body>
-    <div metal:define-macro="list_menu_box">
-      <div metal:use-macro="here/menu_box/macros/menu_box">
-        <div metal:fill-slot="buttons"
-             tal:define="form_id form/id;
-                         list_method_id request/list_method_id | nothing;
-                         selection_name form/listbox/selection_name | string:">
-          <input type="hidden" name="selection_name" value="selection_name"
-              tal:attributes="value selection_name">
-          <input type="hidden" name="list_method_id" value="list_method_id"
-              tal:attributes="value list_method_id" tal:condition="list_method_id">
-          <img src="/images/pro/images/sepacla.png" alt="|"
-               tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
-          <input type="image" src="/images/pro/images/editcopy.png" title="Copy"
-               width="22" height="22"
-               name="Folder_copy:method" alt="Copy"
-               i18n:attributes="title" i18n:domain="ui"
-               tal:attributes="src string:$portal_url/images/editcopy.png"/>&nbsp;
-          <input type="image" src="/images/pro/images/editcut.png" title="Cut"
-               width="22" height="22"
-               name="Folder_cut:method" alt="Cut"
-               i18n:attributes="title" i18n:domain="ui"
-               tal:attributes="src string:$portal_url/images/editcut.png"/>&nbsp;
-          <input type="image" src="/images/pro/images/editpaste.png" title="Paste"
-               width="22" height="22"
-               name="Folder_paste:method" alt="Paste"
-               i18n:attributes="title" i18n:domain="ui"
-               tal:attributes="src string:$portal_url/images/editpaste.png"/>&nbsp;
-          <img src="/images/pro/images/sepacla.png" alt="|"
-               tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
-          <span tal:condition="print_actions">
-          <input type="image" src="/images/pro/images/print.png" title="Print"
-               width="22" height="22"
-               name="Folder_print:method" alt="Print"
-               i18n:attributes="title" i18n:domain="ui"
-               tal:attributes="src string:$portal_url/images/print.png"/>&nbsp;
-          </span>
-          <input type="image" src="/images/pro/images/filenew.png" title="New"
-               width="22" height="22"
-               name="Folder_create:method" alt="New"
-               i18n:attributes="title" i18n:domain="ui"
-               tal:attributes="src string:$portal_url/images/filenew.png"/>&nbsp;
-          <input type="image" src="/images/pro/images/edittrash.png"
-               title="Delete" width="22" height="22"
-               name="Folder_deleteObjectList:method" alt="Delete"
-               i18n:attributes="title" i18n:domain="ui"
-               tal:attributes="src string:$portal_url/images/edittrash.png"/>&nbsp;
-          <img src="/images/pro/images/sepacla.png" alt="|"
-               tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
-          <span tal:condition="search_actions">
-            <a href="" tal:attributes="
-                href python:search_actions[0]['url']
-                + '?selection_name=%s&dialog_category=%s&form_id=%s'
-                % (selection_name , 'object_search', form_id) ">
-              <img src="/images/pro/images/find.png" width="22" height="22" border="0"
-                   title="Find" alt="Find"
-                   i18n:attributes="title" i18n:domain="ui"
-                   tal:attributes="src string:$portal_url/images/find.png"/>
-            </a>&nbsp;
-          </span>
-          <input type="image" src="/images/pro/images/toutsel.png" title="Show All"
-                 width="22" height="22"
-                 i18n:attributes="title" i18n:domain="ui"
-                 name="Folder_show:method" alt="Show All"
-                 tal:attributes="src string:$portal_url/images/toutsel.png"/>&nbsp;
-          <input type="image" src="/images/pro/images/filter.png" title="Filter"
-                 width="22" height="22"
-                 name="Folder_filter:method" alt="Filter"
-                 i18n:attributes="title" i18n:domain="ui"
-                 tal:attributes="src string:$portal_url/images/filter.png"/>&nbsp;
-          <span tal:condition="sort_actions">
-            <a href="" tal:attributes="
-                href python:sort_actions[0]['url']
-                + '?selection_name=%s&form_id=%s' %
-                (selection_name, form_id)">
-              <img src="/images/pro/images/trier.png" width="22" height="22" border="0"
-                   title="Sort" alt="Sort"
-                   i18n:attributes="title" i18n:domain="ui"
-                   tal:attributes="src string:$portal_url/images/trier.png"/>
-            </a>&nbsp;
-          </span>
-          <img src="/images/pro/images/sepacla.png" border="0" alt="|"
-               tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
-          <span tal:condition="exchange_actions">
-            <a href="" tal:attributes="
-                href python:exchange_actions[0]['url']
-                + '?selection_name=%s&dialog_category=%s&form_id=%s'
-                % (selection_name , 'object_exchange', form_id) ">
-              <img src="/images/pro/images/imp-exp.png" width="22" height="22" border="0"
-                   title="Import / Export" alt="Import / Export"
-                   i18n:attributes="title" i18n:domain="ui"
-                   tal:attributes="src string:$portal_url/images/imp-exp.png"/> &nbsp;
-            </a>
-          </span>
-          <span tal:condition="report_actions">
-             <a href="" tal:attributes="
-                 href python:report_actions[0]['url']
-                + '?selection_name=%s&dialog_category=%s&form_id=%s'
-                % (selection_name , 'object_report', form_id) ">
-               <img src="/images/pro/images/etat3.png" width="22" height="22" border="0"
-                    title="Report" alt="Report"
-                    i18n:attributes="title" i18n:domain="ui"
-                    tal:attributes="src string:$portal_url/images/etat3.png"/> &nbsp;
-             </a>
-          </span>
-          <span tal:condition="exchange_actions | report_actions">
-            <img src="/images/pro/images/sepacla.png" border="0" alt="|"
-                 tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
-          </span>
-          <span tal:condition="ui_actions">
-            <a href="" tal:attributes="
-                href python:ui_actions[0]['url']
-                + '?selection_name=%s&form_id=%s' %
-                (selection_name, form_id)">
-              <img src="/images/pro/images/configure.png" width="22" height="22" border="0"
-                   title="Configure" alt="Configure"
-                   i18n:attributes="title" i18n:domain="ui"
-                   tal:attributes="src string:$portal_url/images/configure.png"/>
-            </a>
-          </span>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/main_template.pt b/product/ERP5/skins/erp5_html_style/main_template.pt
deleted file mode 100755
index 6dd19d1cf7ef3d6b46e29da73d45478c3a6afefa..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/main_template.pt
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-          Thierry Faucher   <tf@nexedi.com>
-          Jean-Paul Smets   <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
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:define-macro="master">
-
-  <script language="JavaScript" src="erp5.js"
-          tal:attributes="src python:'%s/erp5.js' % here.portal_url()">
-  </script>
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type','text/html;; charset=UTF-8')">
-    <meta name="description" content="Generated by main_template" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-    <link href="erp5.css" rel="stylesheet" type="text/css"
-         tal:attributes="href python: here.portal_url() + '/' + 'erp5.css'" />
-  </head>
-
-  <body LEFTMARGIN=0 TOPMARGIN=0 MARGINHEIGHT="0" MARGINWIDTH="0">
-  <form action="Test" method="POST" id="main_form"
-      tal:attributes="action here/absolute_url"
-      tal:define="global has_local python: 'local_pt' in here.objectIds();
-                  global util_macros here/index_html_utils/macros;">
-    <div metal:use-macro="here/global_definition/macros/global_definition" />
-    <input type="hidden" name="object_uid" value="uid"
-       tal:attributes="value here/getUid">
-    <!-- Menu Boxes -->
-    <table cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <td nowrap>
-          <!-- Navigation Box Goes Here -->
-          <div class="NavigationBox">
-            <div metal:use-macro="here/navigation_box/macros/navigation_box"
-              >Navigation Box</div>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <!-- Empty Menu For Design Consistency -->
-          <div class="MenuBox">
-          </div>
-        </td>
-      </tr>
-      <span tal:replace="nothing"><!-- No Use For Now - Add Management Actions to Main Page -->
-      <tr tal:condition="python: not here.portal_membership.isAnonymousUser() and len(here.breadcrumbs()) > 1">
-        <td valign="middle" >
-          <!-- Menu Box Goes Here -->
-          <div class="MenuBox">
-            <span
-             metal:use-macro="here/view_menu_box/macros/menu_box">
-             Menu Box
-            </span>
-          </div>
-        </td>
-      </tr>
-      </span>
-    </table>
-    <!-- Breadcrumb, owner and date-->
-    <div class="Breadcrumb">
-      <span metal:use-macro="here/breadcrumb/macros/full_breadcrumb">
-        Breadcrumb
-      </span>
-    </div>
-    <!-- Optional Portal Status Message -->
-    <div class="Main"
-       tal:condition="request/portal_status_message | nothing">
-     <table><tr><td class="error"
-                    i18n:translate="" i18n:domain="ui"
-                    tal:content="request/portal_status_message">
-              </td></tr>
-     </table>
-    </div>
-    <!-- Main Zone -->
-    <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <div class="OutMain">
-          <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img"
-            tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        </div>
-        <td>
-          <!-- Main Content -->
-          <div class="Main">
-            <div metal:define-slot="main">Main Content</div>
-          </div>
-        </td>
-        <div class="OutMain">
-          <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-              border="0"
-              tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        </div>
-      </tr>
-    </table>
-<!--<span tal:replace="structure request" />-->
-  </form>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/menu_box.pt b/product/ERP5/skins/erp5_html_style/menu_box.pt
deleted file mode 100755
index 04d6c3d4b2ac09da0ef46ac1ad619dfbb1dea0df..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/menu_box.pt
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-          Thierry Faucher     <tf@nexedi.com>
-          Jean-Paul Smets     <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
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:define-macro="master">
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by menu_box" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-  </head>
-
-  <body>
-    <div metal:define-macro="menu_box" tal:define="absolute_url here/absolute_url">
-      <table border="0" cellpadding="0" cellspacing="0" width="100%">
-        <tr>
-          <td valign="middle" align="left" nowrap>&nbsp;
-             <select name="jump_select" size="1" tal:attributes="onChange string:submitAction(this.form,'${absolute_url}/Base_doJump')">
-              <option selected value="1" disabled i18n:translate="" i18n:domain="ui">Jump...</option>
-              <span tal:repeat="action jump_actions">
-               <option value="1" tal:content="action/name"
-                       i18n:translate="" i18n:domain="ui"
-                       tal:attributes="value action/url">Saut</option>
-              </span>
-             </select></td>
-          <td valign="bottom" align="center" nowrap>
-            <input type="image" src="/images/pro/images/jump.png" title="Jump"
-              alt="Jump" name="Base_doJump:method"
-              i18n:attributes="title" i18n:domain="ui"
-              tal:attributes="src string:$portal_url/images/jump.png"/> &nbsp;
-            <img src="/images/pro/images/sepacla.png" alt="|"
-                 tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;&nbsp;
-          </td>
-          <td valign="middle" align="right" nowrap>
-            <select name="action_select" size="1" tal:attributes="onChange string:submitAction(this.form,'${absolute_url}/Base_doAction')">
-              <option selected value="" disabled i18n:translate="" i18n:domain="ui">Action...</option>
-              <span tal:repeat="content here/allowedContentTypes | nothing"
-                    tal:on-error="nothing">
-               <option value="" tal:attributes="value python: 'add ' + content.id"
-                 i18n:translate="" i18n:domain="ui">Add <tal:block tal:content="content/Title" i18n:name="portal_type" i18n:translate="" i18n:domain="ui">portal type</tal:block></option>
-              </span>
-              <option disabled i18n:translate="" i18n:domain="ui">-- Workflows --</option>
-              <span tal:repeat="action workflow_actions">
-               <option value="1" tal:content="action/name"
-                 i18n:translate="" i18n:domain="ui"
-                 tal:attributes="value python: 'workflow ' + action['url']">Saut</option>
-              </span>
-              <option disabled i18n:translate="" i18n:domain="ui">-- Object --</option>
-              <span tal:repeat="action object_actions">
-               <option value="1" tal:content="action/name"
-                 i18n:translate="" i18n:domain="ui"
-                 tal:attributes="value python: 'object ' + action['url']">Saut</option>
-              </span>
-              <!--option disabled>-- folder --</option>
-              <span tal:repeat="action folder_actions">
-               <option value="1" tal:content="action/name"
-                 tal:attributes="value python: 'folder ' + action['url']">Saut</option>
-              </span-->
-            </select></td>
-          <td valign="bottom" align="left" nowrap> &nbsp;
-            <input type="image" src="/images/pro/images/exec16.png" title="Action"
-              alt="Action" name="Base_doAction:method"
-              i18n:attributes="title" i18n:domain="ui"
-              tal:attributes="src string:$portal_url/images/exec16.png"/> &nbsp;
-          </td>
-          <td width="100%"><span metal:define-slot="buttons"/></td>
-          <td aligh="right" valign="center">
-            <img alt="Activity Pending" src="/images/pro/images/activity_busy.png"
-                 tal:condition="here/hasActivity | nothing"
-                 border="0" title="Activity Pending"
-                 i18n:attributes="title" i18n:domain="ui"
-                 tal:attributes="src string:$portal_url/images/activity_busy.png"/>
-          </td>
-        </tr>
-      </table>
-    </div>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/navigation_box.pt b/product/ERP5/skins/erp5_html_style/navigation_box.pt
deleted file mode 100755
index 535f67ef8ca3e62e4cf78479decfda9286b1de2a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/navigation_box.pt
+++ /dev/null
@@ -1,188 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-           Thierry Faucher   <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-    xml:lang="en"
-    xmlns:tal="http://xml.zope.org/namespaces/tal"
-    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-    xmlns:metal="http://xml.zope.org/namespaces/metal"
-    meta:define-macro="master">
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by navigation_box" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-  </head>
-
-  <body>
-    <table width="100%" metal:define-macro="navigation_box">
-      <tr>
-        <td valign="middle" align="center" nowrap>
-          <!-- Hidden button as explained in http://ppewww.ph.gla.ac.uk/~flavell/www/formquestion.html -->
-          <!-- We should probably call the default method instead -->
-          <input class="input_image" type="image" src="/images/pro/images/spacer.png" width="3" height="3" border="0"
-                 alt="dummy" name="Base_doSelect:method"
-                 tal:define="form_action form/action | form/id | template/id | script/id"
-                 tal:attributes="name python:form_action + ':method';
-                                 src string:$portal_url/images/spacer.png">
-          <select name="favorite_select" size="1"
-              tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/Base_doFavorite')">
-            <option selected value="" i18n:translate="" i18n:domain="ui" disabled>My favourites</option>
-            <span tal:condition="ordered_global_actions">
-              <span tal:repeat="action ordered_global_actions">
-                <option disabled
-                        tal:condition="action/disabled"
-                        i18n:translate="" i18n:domain="ui">
-                  -- <tal:block tal:replace="action/title" /> --
-                </option>
-                <tal:block tal:condition="not:action/disabled"
-                           tal:define="name python: action.get('name', '');
-                                       index python: name.find(' (');
-                                       ">
-                  <tal:block tal:condition="python: index >= 0">
-                    <option value="1" tal:attributes="value action/url">
-                      <tal:block tal:content="python: name[:index]"
-                                 i18n:translate="" i18n:domain="ui">
-                        Drafts to confirmed
-                      </tal:block>
-                      <tal:block tal:replace="python: name[index:]">
-                        (12)
-                      </tal:block>
-                    </option>
-                  </tal:block>
-                  <tal:block tal:condition="python: index < 0">
-                    <option value="1"
-                        i18n:translate="" i18n:domain="ui"
-                        tal:content="action/name"
-                        tal:attributes="value action/url">
-                      name
-                    </option>
-                  </tal:block>
-                </tal:block>
-              </span>
-            </span>
-            <span tal:condition="user_actions">
-              <option disabled
-                      i18n:translate="" i18n:domain="ui">
-                -- User --
-              </option>
-              <span tal:repeat="action user_actions">
-                 <option value="1"
-                   i18n:translate="" i18n:domain="ui"
-                   tal:content="action/name"
-                   tal:attributes="value action/url">Saut</option>
-              </span>
-            </span>
-          </select>
-        </td>
-        <td valign="middle" align="left" nowrap>
-          <input class="input_image" type="image" src="/images/pro/images/favourite.png" title="Select Favorite"
-              i18n:attributes="title" i18n:domain="ui"
-              alt="Select Favorite" name="Base_doFavorite:method"
-              tal:attributes="src string:$portal_url/images/favourite.png"/>&nbsp;
-          <img src="/images/pro/images/sepafon.png" alt="|" tal:attributes="src string:$portal_url/images/sepafon.png"/>&nbsp;&nbsp;
-        </td>
-        <td align="center" valign="middle" nowrap>
-            <select name="module_select" size="1"
-                    tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/Base_doModule')"
-                    tal:define="module_list here/ERP5Site_getModuleItemList">
-                <option selected value="" i18n:translate="" i18n:domain="ui" disabled>ERP5 Modules</option>
-                <span tal:repeat="module module_list">
-                  <option value="something"
-                          i18n:translate="" i18n:domain="ui"
-                          tal:attributes="value python: module[0]"
-                          tal:content="python: module[1]" />
-                </span>
-            </select>
-        </td>
-        <td align="left" valign="middle" nowrap>
-          <input class="input_image" type="image" src="/images/pro/images/appearance.png" title="Select Module"
-              i18n:attributes="title" i18n:domain="ui"
-              alt="Select Module" name="Base_doModule:method" tal:attributes="src string:$portal_url/images/appearance.png"/>&nbsp;
-          <!--img src="/images/pro/images/sepafon.png"  alt="img" />&nbsp;
-          <a href="undo_form">
-           <img border="0" src="/images/pro/images/kmago.png" alt="img"/>&nbsp;&nbsp;
-          </a>
-          <img src="/images/pro/images/reload.png"  alt="img"/-->
-        </td>
-        <td valign="middle" align="center" nowrap width="100%">
-          <div align="center">
-            <!--img src="/images/pro/images/mail.png"  alt="Email" title="Email"
-                 i18n:attributes="title"/>
-            <a href="http://www.coramy.fr">
-            <img src="/images/pro/images/intranet.png" alt="Intranet" title="Intranet"
-               i18n:attributes="title"/></a>
-            <a href="http://192.168.253.14:9673/coramy/help/index"
-               tal:attributes="href here/portal_properties/online_help_url">
-            <img src="/images/pro/images/help.png"  alt="Online Help" title="Online Help"
-                 i18n:attributes="title"/></a-->
-          </div>
-        </td>
-        <td  align="right" valign="middle">
-          <!-- XXX This part depends on Localizer because of get_languages_map  -->
-          <select name="language_select" size="1"
-                  tal:attributes="onChange string:submitAction(this.form,'${here/absolute_url}/Base_doLanguage')"
-                  tal:define="language_map python: here.Localizer.get_languages_map()">
-            <option selected value="" i18n:translate="" i18n:domain="ui" disabled>My language</option>
-            <tal:block tal:repeat="language language_map">
-              <tal:block tal:condition="language/selected">
-                <option value="en"
-                        selected
-                        tal:attributes="value language/id"
-                        tal:content="python: here.translation_service.translate('ui', language['title'], target_language=language['id'])">
-                  English
-                </option>
-              </tal:block>
-              <tal:block tal:condition="not:language/selected">
-                <option value="en"
-                        tal:attributes="value language/id"
-                        tal:content="python: here.translation_service.translate('ui', language['title'], target_language=language['id'])">
-                  English
-                </option>
-              </tal:block>
-            </tal:block>
-          </select>
-        </td>
-        <td  align="right" valign="middle" nowrap>
-          <input class="input_image" type="image"
-src="/images/pro/images/info.png"
-                 title="Change Language" alt="Change Language"  name="Base_doLanguage:method"
-                 i18n:attributes="title" i18n:domain="ui"
-                 tal:attributes="src string:$portal_url/images/language.png" />&nbsp;
-          <img src="/images/pro/images/sepafon.png" alt="|" tal:attributes="src string:$portal_url/images/sepafon.png"/>&nbsp;&nbsp;
-        </td>
-        <td  align="right" valign="middle">
-            <input type="text" name="SearchableText">
-        </td>
-        <td  align="right" valign="middle">
-          <input class="input_image" type="image"
-src="/images/pro/images/info.png"
-                 title="Search" alt="Search"  name="search:method"
-                 i18n:attributes="title" i18n:domain="ui"
-                 tal:attributes="src string:$portal_url/images/info.png" />
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/view_dialog_master.pt b/product/ERP5/skins/erp5_html_style/view_dialog_master.pt
deleted file mode 100755
index 18b9ea445931eb1f847525d4bb3163ee7fa36852..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/view_dialog_master.pt
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-     Thierry Faucher  <tf@nexedi.com>
-     Jean-Paul Smets  <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
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:define-macro="master">
-
-  <script language="JavaScript" src="erp5.js"
-          tal:attributes="src python:'%s/erp5.js' % here.portal_url()">
-  </script>
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by view_dialog_master" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <!--title tal:content="template/title_or_id">The title</title-->
-    <title tal:content="request/button_title|template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-    <link href="erp5.css" rel="stylesheet" type="text/css"
-         tal:attributes="href python: here.portal_url() + '/' + 'erp5.css'" />
-  </head>
-
-  <body>
-  <form action="Test" method="POST" id="main_form"
-      tal:attributes="action here/absolute_url;
-                      method form/method | nothing;
-                      enctype form/enctype | nothing"
-      tal:define="selection_name request/selection_name | string:">
-    <div metal:use-macro="here/global_definition/macros/global_definition" />
-    <input type="hidden" name="form_id" value="form"
-       tal:attributes="value request/form_id">
-    <span tal:condition="request/previous_md5_object_uid_list | nothing">
-    <input type="hidden" name="previous_md5_object_uid_list" value="form"
-       tal:attributes="value request/previous_md5_object_uid_list">
-    </span>
-    <input type="hidden" name="dialog_id" value="form"
-       tal:attributes="value form/id">
-    <input type="hidden" name="selection_name" value="selection_name"
-              tal:attributes="value selection_name">
-    <!-- Menu Boxes -->
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
-      <tr>
-        <td>
-          <!-- Navigation Box Goes Here -->
-          <div class="NavigationBox">
-            <div metal:use-macro="here/navigation_box/macros/navigation_box"
-              >Navigation Box</div>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <!-- Menu Box Goes Here -->
-
-          <div class="MenuBox">
-            <!--<div metal:use-macro="here/list_menu_box/macros/list_menu_box"
-              >MenuBox</div> -->
-          </div>
-        </td>
-      </tr>
-    </table>
-    <!-- Breadcrumb, owner and date-->
-    <div class="Breadcrumb">
-      <div metal:use-macro="here/breadcrumb/macros/small_breadcrumb"
-        >Breadcrumb</div>
-    </div>
-    <!-- Optional Portal Status Message -->
-    <div class="Main"
-       tal:condition="request/portal_status_message | nothing">
-     <table><tr><td class="error"
-              i18n:translate="" i18n:domain="ui"
-              tal:content="request/portal_status_message">
-              </td></tr>
-     </table>
-    </div>
-    <!-- Main Zone -->
-    <table border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <div class="OutMain">
-          <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img"
-            tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        </div>
-        <td>
-          <!-- Main Content -->
-          <div class="Main">
-            <div metal:define-slot="main">Main Content</div>
-          </div>
-        </td>
-        <div class="OutMain">
-          <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-              border="0"
-              tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        </div>
-      </tr>
-      <tr>
-        <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img"
-            tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        <td></td>
-        <td></td>
-      </tr>
-      <tr>
-        <td width="5"><img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img"
-            tal:attributes="src string:$portal_url/images/spacer.png"/></td>
-        <td align="left"
-          tal:define="cancel_url request/cancel_url | request/HTTP_REFERER;
-                      previous_form_id request/previous_form_id | nothing">
-          <img src="/images/pro/images/spacer.png" width="5" height="5"
-            border="0" alt="img"
-            tal:attributes="src string:$portal_url/images/spacer.png"/>
-          <input type="hidden" name="dialog_method" value="cancel_url"
-                tal:attributes="value python: form.action"/>
-          <input type="hidden" name="cancel_url" value="cancel_url"
-                tal:attributes="value cancel_url">
-          <input type="hidden" name="previous_form_id" value="previous_form_id"
-                tal:attributes="value previous_form_id">
-          <input type="Submit"  value="Cancel" name="base_cancel:method"
-                />&nbsp;
-          <span tal:condition="python: form.update_action!=''">
-          <input type="hidden" name="update_method" value="cancel_url"
-                tal:attributes="value python: form.update_action"/>
-          <input type="Submit"  value="Cancel"
-                name="base_view_update_dialog:method"
-                i18n:attributes="value" i18n:domain="ui"
-                tal:attributes="value request/button_title|form/title"/>
-          </span>
-          <input type="Submit"  value="Search"
-                i18n:attributes="value" i18n:domain="ui"
-                name="base_view_dialog:method"
-                tal:attributes="value request/button_title|form/title"/>
-        </td>
-        <td></td>
-      </tr>
-    </table>
-  </form>
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/view_master.pt b/product/ERP5/skins/erp5_html_style/view_master.pt
deleted file mode 100755
index 673829b3d3b6e14d3ff75786ec2f31234c169177..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/view_master.pt
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-          Thierry Faucher   <tf@nexedi.com>
-          Jean-Paul Smets   <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
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:metal="http://xml.zope.org/namespaces/metal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      metal:define-macro="master">
-
-  <script language="JavaScript" src="erp5.js"
-          tal:attributes="src python:'%s/erp5.js' % here.portal_url()">
-  </script>
-
-  <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by view_master" />
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-    <link href="erp5.css" rel="stylesheet" type="text/css"
-         tal:attributes="href python: here.portal_url() + '/' + 'erp5.css'" />
-  </head>
-
-  <body LEFTMARGIN=0 TOPMARGIN=0 MARGINHEIGHT="0" MARGINWIDTH="0">
-   <form action="Test" name="main_form" id="main_form"
-      tal:attributes="action here/absolute_url;
-                      method form/method | python:'post';
-                      enctype form/enctype | python:'multipart/form-data'"
-      method="post"
-      enctype="multipart/form-data" >
-    <div metal:use-macro="here/global_definition/macros/global_definition" />
-    <input type="hidden" name="form_id" value="form"
-       tal:attributes="value form/id | template/id | script/id">
-    <input type="hidden" name="object_uid" value="uid"
-       tal:attributes="value here/getUid">
-    <input type="hidden" name="object_path" value="path"
-       tal:attributes="value here/getPath">
-    <!-- Menu Boxes -->
-    <table cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-        <td nowrap>
-          <!-- Navigation Box Goes Here -->
-          <div class="NavigationBox">
-            <div metal:use-macro="here/navigation_box/macros/navigation_box"
-              >Navigation Box</div>
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td valign="middle" >
-          <!-- Menu Box Goes Here -->
-          <div class="MenuBox">
-            <span
-             metal:use-macro="here/view_menu_box/macros/menu_box">
-             Menu Box
-            </span>
-          </div>
-        </td>
-      </tr>
-    </table>
-    <!-- Breadcrumb, owner and date-->
-    <div class="Breadcrumb">
-      <span metal:use-macro="here/breadcrumb/macros/full_breadcrumb">
-        Breadcrumb
-      </span>
-    </div>
-    <!-- Optional Portal Status Message -->
-    <div class="Main"
-       tal:condition="request/portal_status_message | nothing">
-     <table><tr><td class="error"
-                    i18n:translate="" i18n:domain="ui"
-                    tal:content="request/portal_status_message">
-              </td></tr>
-     </table>
-    </div>
-    <!-- Main -->
-      <table border="0" cellpadding="0" cellspacing="0" width="99%">
-        <tr>
-          <td width="5" class="OutMain"><img src="/images/pro/images/spacer.png"
-            width="5" height="5" border="0"
-            tal:attributes="src string:$portal_url/images/spacer.png"/>
-          </td>
-          <td>
-            <table border="0" cellpadding="0" cellspacing="0" width="100%">
-              <tr>
-                <td width="100%">
-                  <table border="0" cellpadding="0" cellspacing="0"
-                       width="100%">
-                    <tr>
-                      <td width="100%" class="OutMain">
-                        <!-- View Selection Menu goes here -->
-                        <span
-metal:use-macro="here/view_selection_box/macros/view_selection_box">
-                           View selection bar
-                        </span>
-                      </td>
-                    </tr>
-                  </table>
-                </td>
-              </tr>
-              <tr>
-              <!-- Main Content -->
-                <td width="100%" class="MainContent" >
-                  <div metal:define-slot="main">
-                    Main Content
-                  </div>
-                </td>
-              </tr>
-            </table>
-          </td>
-          <td width="1" class="OutMain"><img src="/images/pro/images/spacer.png"
-                     width="1" height="1" border="0" alt="img"
-                     tal:attributes="src string:$portal_url/images/spacer.png"/>
-          </td>
-        </tr>
-      </table>
-    </form>
-<!--<span tal:replace="structure request" />-->
-  </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/view_menu_box.pt b/product/ERP5/skins/erp5_html_style/view_menu_box.pt
deleted file mode 100755
index 200b8cb613d3db364a22cc74131acacc6a7064e7..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/view_menu_box.pt
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-       Thierry Faucher  <tf@nexedi.com>
-
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      xmlns:metal="http://xml.zope.org/namespaces/metal">
-
- <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-    <meta name="description" content="Generated by view_menu_box" />
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-  <link href="erp5.css" rel="stylesheet" type="text/css" />
- </head>
-
- <body>
-  <div metal:define-macro="menu_box"
-    tal:define="form_id form/id | nothing;
-                selection_name python:request.get('selection_name','default');
-                selection_index request/selection_index | nothing;
-                selection_url python:here.portal_selections.getSelectionListUrlFor(selection_name,REQUEST=request)
-                ">
-   <input type="hidden" name="selection_name" value="selection_name"
-    tal:attributes="value selection_name">
-   <input type="hidden" name="selection_index" value="selection_index"
-    tal:attributes="value selection_index">
-   <input type="hidden" name="selection_url" value="selection_url"
-    tal:attributes="value selection_url">
-   <div metal:use-macro="here/menu_box/macros/menu_box">
-    <div metal:fill-slot="buttons">
-     <img src="/images/pro/images/sepacla.png" alt="|"
-     tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
-     <span tal:condition="selection_url">
-       <a href="list" tal:attributes="href selection_url">
-        <img src="/images/pro/images/text_block.png" width="22" height="22"
-          title="List Mode" alt="List Mode" border="0"
-          i18n:attributes="title" i18n:domain="ui"
-          tal:attributes="src string:$portal_url/images/text_block.png"/>&nbsp;
-       </a>
-       <img src="/images/pro/images/sepacla.png"  alt="|"
-            tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
-     </span>
-     <span tal:condition="search_actions">
-        <a href="" tal:attributes="
-            href python:search_actions[0]['url']
-            + '?selection_name=%s&dialog_category=%s&form_id=%s'
-            % (selection_name , 'object_search', form_id) ">
-          <img src="/images/pro/images/find.png" width="22" height="22" border="0"
-               title="Find" alt="Find"
-               i18n:attributes="title" i18n:domain="ui"
-               tal:attributes="src string:$portal_url/images/find.png"/>
-        </a>&nbsp;
-     </span>
-     <span tal:condition="print_actions">
-       <a href=""
-         tal:attributes="href python:print_actions[0]['url']
-            + '?selection_name=%s&dialog_category=%s&form_id=%s'
-            % (selection_name , 'object_print', form_id) ">
-         <img src="/images/pro/images/print.png"
-              title="Print" width="22" height="22"
-              alt="Print" border="0"
-              i18n:attributes="title" i18n:domain="ui"
-              tal:attributes="src string:$portal_url/images/print.png"/>
-     </a>&nbsp;
-     </span>
-     <input type="image" src="/images/pro/images/filenew.png" title="New"
-            width="22" height="22" name="Base_createNewDocument:method" alt="New"
-            i18n:attributes="title" i18n:domain="ui"
-            tal:attributes="src string:$portal_url/images/filenew.png"/>&nbsp;
-     <span tal:condition="selection_index">
-       <img src="/images/pro/images/sepacla.png" border="0" alt="|"
-            tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
-       <a href="First" tal:attributes="href
-          string:portal_selections/viewFirst?form_id=$form_id&selection_index=$selection_index&selection_name=$selection_name"
-          ><img width="22" height="22"
-          src="/images/pro/images/2leftarrowb.png" border="0"
-          title="First"  alt="First"
-          i18n:attributes="title" i18n:domain="ui"
-          tal:attributes="src string:$portal_url/images/2leftarrowb.png" /></a>
-       <a href="Previous" tal:attributes="href
-          string:portal_selections/viewPrevious?form_id=$form_id&selection_index=$selection_index&selection_name=$selection_name"
-          ><img width="22" height="22"
-          src="/images/pro/images/1leftarrowb.png" border="0"
-          title="Previous"  alt="Previous"
-          i18n:attributes="title" i18n:domain="ui"
-          tal:attributes="src string:$portal_url/images/1leftarrowb.png" /></a>
-       <a href="Next" tal:attributes="href
-          string:portal_selections/viewNext?form_id=$form_id&selection_index=$selection_index&selection_name=$selection_name"
-          ><img width="22" height="22"
-          src="/images/pro/images/1rightarrowb.png" border="0"
-          title="Next"  alt="Next"
-          i18n:attributes="title" i18n:domain="ui"
-          tal:attributes="src string:$portal_url/images/1rightarrowb.png"/></a>
-       <a href="Last" tal:attributes="href
-          string:portal_selections/viewLast?form_id=$form_id&selection_index=$selection_index&selection_name=$selection_name"
-          ><img width="22" height="22"
-          src="/images/pro/images/2rightarrowb.png" border="0"
-          title="Last"  alt="Last"
-          i18n:attributes="title" i18n:domain="ui"
-          tal:attributes="src string:$portal_url/images/2rightarrowb.png"/></a>&nbsp;
-     </span>
-     <img src="/images/pro/images/sepacla.png" border="0" alt="|"
-          tal:attributes="src string:$portal_url/images/sepacla.png"/>&nbsp;
-     <span tal:condition="exchange_actions">
-        <a href="" tal:attributes="
-            href python:exchange_actions[0]['url']
-            + '?selection_name=%s&dialog_category=%s&form_id=%s'
-            % (selection_name , 'object_exchange', form_id) ">
-          <img src="/images/pro/images/imp-exp.png" width="22" height="22" border="0"
-               title="Import / Export" alt="Import / Export"
-               i18n:attributes="title" i18n:domain="ui"
-               tal:attributes="src string:$portal_url/images/imp-exp.png"/> &nbsp;
-        </a>
-     </span>
-     <span tal:condition="report_actions">
-         <a href="" tal:attributes="
-             href python:report_actions[0]['url']
-            + '?selection_name=%s&dialog_category=%s&form_id=%s'
-            % (selection_name , 'object_report', form_id) ">
-           <img src="/images/pro/images/etat3.png" width="22" height="22" border="0"
-                title="Report" alt="Report"
-                i18n:attributes="title" i18n:domain="ui"
-                tal:attributes="src string:$portal_url/images/etat3.png"/> &nbsp;
-         </a>
-     </span>
-    </div>
-   </div>
-  </div>
- </body>
-</html>
diff --git a/product/ERP5/skins/erp5_html_style/view_selection_box.pt b/product/ERP5/skins/erp5_html_style/view_selection_box.pt
deleted file mode 100755
index c3f432610d4bbcbd3f7a5575d2da68cb59759641..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_html_style/view_selection_box.pt
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "DTD/xhtml1-strict.dtd">
-<?xml-stylesheet  href="erp5.css" rel="stylesheet" type="text/css"?>
-
-<span tal:replace="nothing">
-<!--
-Copyright (c) 2002 Nexedi SARL and Contributors. All Rights Reserved.
-                   Thierry Faucher     <tf@nexedi.com>
-                   Jean-Paul Smets     <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
-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.
--->
-</span>
-
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en"
-      xml:lang="en"
-      xmlns:tal="http://xml.zope.org/namespaces/tal"
-      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-      xmlns:metal="http://xml.zope.org/namespaces/metal">
- <head tal:define="dummy python:request.RESPONSE.setHeader('Content-Type', 'text/html;; charset=utf-8')">
-  <meta name="description" content="Generated by view_selection_box" />
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui">The title</title>
-  <link href="erp5.css" rel="stylesheet" type="text/css" />
- </head>
-
- <body>
-  <div metal:define-macro="view_selection_box">
-   <table border="0" cellpadding="0" cellspacing="0" width="100%"
-     class="Outmain"
-     tal:define="isAnon python:here.portal_membership.isAnonymousUser();
-        AuthClass python:isAnon and 'GuestActions' or 'MemberActions';
-        uname python: isAnon and 'Guest' or
-            here.portal_membership.getAuthenticatedMember().getUserName();
-        this_form_id form/id | template/id | script/id;
-        current_url python: here.absolute_url() + '/' + this_form_id;
-        selection_index request/selection_index | string:;
-        selection_name request/selection_name | string: ">
-
-    <tr height="34">
-     <td valign="bottom" align="left" class="Main" height="34">
-      <table border="0" cellpadding="0" cellspacing="0" width="1">
-        <tr>
-         <td valign="bottom" colspan="6" class="OutMain">
-          <img src="/images/pro/images/spacer.png" width="1" height="100%" border="0"
-               tal:attributes="src string:$portal_url/images/spacer.png"/>
-         </td>
-        </tr>
-        <tr>
-         <span tal:repeat="action view_actions">
-          <td valign="bottom" width="17">
-           <img src="/images/pro/images/Left.png" border="0" alt="left"
-           tal:attributes="src string:$portal_url/images/Left.png"/>
-          </td>
-          <td nowrap class="BorderTop" valign="bottom">
-           <img src="/images/pro/images/spacer.png" width="5" height="5" border="0"
-                alt="spacer" tal:attributes="src string:$portal_url/images/spacer.png"/>
-          </td>
-          <td valign="bottom" width="17">
-           <img src="/images/pro/images/Right.png" border="0"  alt="right"
-                tal:attributes="src string:$portal_url/images/Right.png"/>
-          </td>
-         </span>
-        </tr>
-        <tr>
-         <span tal:repeat="action view_actions">
-          <span tal:condition="python: current_url == action['url']">
-           <td class="BorderLeft" valign="bottom"  width="17"
-              tal:condition="python: not repeat['action'].start">
-            <img src="/images/pro/images/spacer.png" width="5" height="5" border="0"
-             alt="spacer" tal:attributes="src string:$portal_url/images/spacer.png"/>
-           </td>
-           <td class="BorderLeft" valign="bottom"
-            tal:condition="repeat/action/start">
-            <img src="/images/pro/images/spacer.png" width="5" height="5" border="0"
-             alt="spacer" tal:attributes="src string:$portal_url/images/spacer.png"/>
-           </td>
-          </span>
-          <span tal:condition="python: current_url != action['url']">
-           <td class="BorderLeftBottom" valign="bottom"  width="17"
-              tal:condition="python: not repeat['action'].start">
-            <img src="/images/pro/images/spacer.png" width="5" height="5" border="0"
-             alt="spacer" tal:attributes="src string:$portal_url/images/spacer.png"/>
-           </td>
-           <td class="BorderLeftBottom" valign="bottom"
-            tal:condition="repeat/action/start">
-            <img src="/images/pro/images/spacer.png" width="5" height="5" border="0"
-             alt="spacer" tal:attributes="src string:$portal_url/images/spacer.png"/>
-           </td>
-          </span>
-          <td nowrap class="On" align="center" valign="bottom"
-             tal:condition="python: current_url == action['url']"
-             tal:define="url action/url">
-           <a tal:content="action/name" href="toto"
-             i18n:translate="" i18n:domain="ui"
-             tal:attributes="href string:$url?selection_index=$selection_index&selection_name=$selection_name">
-            Info.G&eacute;n&eacute;rales
-           </a>
-          </td>
-          <td  nowrap class="Off" valign="bottom" align="center"
-             tal:condition="python: current_url != action['url']"
-             tal:define="url action/url">
-           <a tal:content="action/name" href="toto"
-             i18n:translate="" i18n:domain="ui"
-             tal:attributes="href string:$url?selection_index=$selection_index&selection_name=$selection_name">
-            Info.G&eacute;n&eacute;rales
-           </a>
-          </td>
-          <span tal:condition="python: current_url == action['url']">
-           <td valign="bottom" width="17"
-              tal:condition="python: not repeat['action'].end">
-            <img src="/images/pro/images/spacer.png" width="5" height="5" border="0"
-             alt="spacer" tal:attributes="src string:$portal_url/images/spacer.png"/>
-           </td>
-          </span>
-          <span tal:condition="python: current_url != action['url']">
-           <td valign="bottom" width="17" class="BorderBottom"
-              tal:condition="python: not repeat['action'].end">
-            <img src="/images/pro/images/spacer.png" width="5" height="5" border="0"
-             alt="spacer" tal:attributes="src string:$portal_url/images/spacer.png"/>
-           </td>
-          </span>
-          <span tal:condition="python: current_url != action['url']">
-           <td class="BorderRightBottom" valign="bottom" width="17"
-            tal:condition="repeat/action/end">
-            <img src="/images/pro/images/spacer.png" width="5" height="5" border="0"
-             alt="spacer" tal:attributes="src string:$portal_url/images/spacer.png"/>
-           </td>
-          </span>
-          <span tal:condition="python: current_url == action['url']">
-           <td class="BorderRight" valign="bottom" width="17"
-            tal:condition="repeat/action/end">
-            <img src="/images/pro/images/spacer.png" width="5" height="5" border="0"
-             alt="spacer" tal:attributes="src string:$portal_url/images/spacer.png"/>
-           </td>
-          </span>
-         </span>
-        </tr>
-      </table>
-     </td>
-     <td align="right" width="100%" class="BorderBottom" valign="bottom"
-            height="34">
-      <!-- XXXX This has to be improved so that the condition takes into account ModifyPortalContent permission of the user -->
-      <input type="image" alt="Save" src="/images/pro/images/save2.png"
-        tal:condition="form/action | nothing"
-        border="0" title="Save" name="action:method"
-        i18n:attributes="title" i18n:domain="ui"
-        tal:attributes="name python: form.action + ':method';
-                        src string:$portal_url/images/save2.png"/>
-     </td>
-    </tr>
-   </table>
-  </div>
- </body>
-</html>
diff --git a/product/ERP5/skins/erp5_test/testCategory.py b/product/ERP5/skins/erp5_test/testCategory.py
deleted file mode 100755
index 477302ec5f9e5b8c824344a727a5b9f3e25426be..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_test/testCategory.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# Example code:
-
-global object_list
-object_list = []
-portal = context.getPortalObject()
-
-def failIfDifferent(id, a,b):
-  if a != b:
-    return "Error on %s: %s != %s" % (id, a, b)
-  return None
-
-def failIfDifferentSet(id, a,b):
-  for i in a:
-    if i not in b:
-      return "Error on %s: %s != %s" % (id, a, b)
-  for i in b:
-    if i not in a:
-      return "Error on %s: %s != %s" % (id, a, b)
-  return None
-
-def cleanUp(result):
-  global object_list
-  for o in object_list:
-    o.aq_parent.manage_delObjects(ids=[o.getId()])
-  return result
-
-# Test single category on person
-p = portal.person.newContent()
-object_list.append(p)
-base_category = 'region'
-region = 'europe/west/france'
-region_value = portal.portal_categories.resolveCategory('europe/west/france')
-p.setRegion(region)
-result = failIfDifferent('getRegion 1', p.getRegion(), region)
-if result is not None: return cleanUp(result)
-result = failIfDifferent('getDefaultRegion 1', p.getDefaultRegion(), region)
-if result is not None: return cleanUp(result)
-result = failIfDifferent('getRegionList 1', p.getRegionList(), [region])
-if result is not None: return cleanUp(result)
-
-# Test multiple category on person
-region_list = ['europe/west/france', 'europe/west/germany']
-region_value_list = [portal.portal_categories.resolveCategory('europe/west/france'),
-                     portal.portal_categories.resolveCategory('europe/west/germany')]
-p.setRegion(region_list)
-result = failIfDifferent('getRegion 2', p.getRegion(), region)
-if result is not None: return cleanUp(result)
-result = failIfDifferent('getDefaultRegion 2', p.getDefaultRegion(), region)
-if result is not None: return cleanUp(result)
-result = failIfDifferent('getRegionList 2', p.getRegionList(), region_list)
-if result is not None: return cleanUp(result)
-
-# Test category values
-result = failIfDifferent('getRegion 3', p.getRegionValue(), region_value)
-if result is not None: return cleanUp(result)
-
-# Test None and ''
-p.setRegion(None)
-result = failIfDifferent('getRegion 4', p.getRegion(), None)
-if result is not None: return cleanUp(result)
-p.setRegion('')
-result = failIfDifferent('getRegion 5', p.getRegion(), None)
-if result is not None: return cleanUp(result)
-
-# Test category acquisition for single value
-## XXX TODO: make sure acquisition is updated in Coramy
-o = portal.organisation.newContent()
-object_list.append(o)
-o.setRegion(region)
-p.setSubordinationValue(o)
-result = failIfDifferent('getRegion 6', p.getRegion(), region)
-if result is not None: return cleanUp(result)
-result = failIfDifferent('getDefaultRegion 6', p.getDefaultRegion(), region)
-if result is not None: return cleanUp(result)
-result = failIfDifferent('getRegionList 6', p.getRegionList(), [region])
-if result is not None: return cleanUp(result)
-
-# Test category acquisition for list value
-o.setRegion(region_list)
-result = failIfDifferent('getRegion 7', p.getRegion(), region)
-if result is not None: return cleanUp(result)
-result = failIfDifferent('getDefaultRegion 7', p.getDefaultRegion(), region)
-if result is not None: return cleanUp(result)
-result = failIfDifferent('getRegionList 7', p.getRegionList(), region_list)
-if result is not None: return cleanUp(result)
-
-# Test Value
-result = failIfDifferent('getSubordinationValue 1', p.getSubordinationValue(), o)
-if result is not None: return cleanUp(result)
-result = failIfDifferent('getDefaultSubordinationValue 1', p.getSubordinationValue(), o)
-if result is not None: return cleanUp(result)
-result = failIfDifferent('getSubordinationValueList 1', p.getSubordinationValueList(), [o])
-if result is not None: return cleanUp(result)
-
-# Test Multiple Value
-o2 = portal.organisation.newContent()
-object_list.append(o2)
-subordination_value_list = [o, o2]
-p.setSubordinationValueList(subordination_value_list)
-result = failIfDifferent('getSubordinationValue 2', p.getSubordinationValue(), o)
-if result is not None: return cleanUp(result)
-result = failIfDifferent('getDefaultSubordinationValue 2', p.getSubordinationValue(), o)
-if result is not None: return cleanUp(result)
-result = failIfDifferent('getSubordinationValueList 2', p.getSubordinationValueList(), subordination_value_list)
-if result is not None: return cleanUp(result)
-
-# Test getCategoryParentUidList (ERP5)
-portal.portal_categories.manage_addProduct['ERP5'].addBaseCategory('basecat')
-basecat = portal.portal_categories.basecat
-object_list.append(basecat)
-portal.portal_categories.basecat.manage_addProduct['ERP5'].addCategory('cat1')
-cat1 = portal.portal_categories.basecat.cat1
-portal.portal_categories.basecat.cat1.manage_addProduct['ERP5'].addCategory('cat2')
-cat2 = portal.portal_categories.basecat.cat1.cat2
-parent_uid_list = [(cat2.getUid(), basecat.getUid(), 1),
-                   (cat1.getUid(), basecat.getUid(), 0),
-                   (basecat.getUid(), basecat.getUid(), 0)]
-result = failIfDifferentSet('getCategoryParentUidList',
-             cat2.getCategoryParentUidList(relative_url = cat2.getRelativeUrl()), parent_uid_list)
-if result is not None: return cleanUp(result)
-
-# Test getRelatedValueList (ERP5)
-p.immediateReindexObject() # Make sure well indexed
-p2 = o.getSubordinationRelatedValue()
-result = failIfDifferent('getSubordinationRelatedValue', p2, p)
-if result is not None: return cleanUp(result)
-
-# Cleanup
-cleanUp(None)
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/AccountingModule_addPurchaseInvoiceTransaction.py b/product/ERP5/skins/erp5_trade/AccountingModule_addPurchaseInvoiceTransaction.py
deleted file mode 100755
index 89dace4728979a85295542a0bbca43beb8053634..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/AccountingModule_addPurchaseInvoiceTransaction.py
+++ /dev/null
@@ -1,28 +0,0 @@
-## Script (Python) "AccountingModule_addPurchaseInvoiceTransaction"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=folder, id
-##title=
-##
-product = container.manage_addProduct[ 'ERP5Type' ]
-
-product.addInvoice(id) 
-my_transaction = folder[id]
-
-my_transaction.newContent(portal_type='Purchase Invoice Transaction Line',
-                          source='account/services_exterieurs',
-                          id='expense')
-my_transaction.newContent(portal_type='Purchase Invoice Transaction Line',
-                          source='account/dette_fournisseur',
-                          id='payable')
-my_transaction.newContent(portal_type='Purchase Invoice Transaction Line',
-                          source='account/tva_collectee_196',
-                          id='collected_vat')
-my_transaction.newContent(portal_type='Purchase Invoice Transaction Line',
-                          source='account/tva_recuperable_196',
-                          id='refundable_vat')
-
-return my_transaction
diff --git a/product/ERP5/skins/erp5_trade/AccountingModule_addSaleInvoiceTransaction.py b/product/ERP5/skins/erp5_trade/AccountingModule_addSaleInvoiceTransaction.py
deleted file mode 100755
index cedd231391235b7c6ebe3e96ddcc1e9d90c18b25..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/AccountingModule_addSaleInvoiceTransaction.py
+++ /dev/null
@@ -1,25 +0,0 @@
-## Script (Python) "AccountingModule_addSaleInvoiceTransaction"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=folder, id
-##title=
-##
-product = container.manage_addProduct[ 'ERP5Type' ]
-
-product.addInvoice(id) 
-my_transaction = folder[id]
-
-my_transaction.newContent(portal_type='Sale Invoice Transaction Line',
-                          source='account/prestation_service',
-                          id='income')
-my_transaction.newContent(portal_type='Sale Invoice Transaction Line',
-                          source='account/creance_client',
-                          id='receivable')
-my_transaction.newContent(portal_type='Sale Invoice Transaction Line',
-                          source='account/tva_collectee_196',
-                          id='collected_vat')
-
-return my_transaction
diff --git a/product/ERP5/skins/erp5_trade/AccountingTransactionLine_getSourcePaymentItemList.py b/product/ERP5/skins/erp5_trade/AccountingTransactionLine_getSourcePaymentItemList.py
deleted file mode 100755
index 57ae23b9137aa4d40e5c85da9d205fd408bc784a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/AccountingTransactionLine_getSourcePaymentItemList.py
+++ /dev/null
@@ -1,24 +0,0 @@
-## Script (Python) "AccountingTransactionLine_getSourcePaymentItemList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-def sort(a, b):
-  return cmp(a[0], b[0])
-
-item_list = [['', '']]
-
-organisation = context.aq_parent.getSourceSectionValue()
-if organisation is not None:
-  bank_account_list = organisation.contentValues(filter={'portal_type': 'Bank Account'})
-  for bank_account in bank_account_list:
-    url = bank_account.getRelativeUrl()
-    label = bank_account.getIban()
-    item_list.append([label, url])
-
-item_list.sort(sort)
-return item_list
diff --git a/product/ERP5/skins/erp5_trade/AccountingTransactionModule_addPaymentTransaction.py b/product/ERP5/skins/erp5_trade/AccountingTransactionModule_addPaymentTransaction.py
deleted file mode 100755
index ad61dbd50c0629ea0198f2a43a77f5a387624118..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/AccountingTransactionModule_addPaymentTransaction.py
+++ /dev/null
@@ -1,25 +0,0 @@
-## Script (Python) "AccountingTransactionModule_addPaymentTransaction"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=folder, id
-##title=
-##
-product = container.manage_addProduct[ 'ERP5Type' ]
-
-product.addAccountingTransaction(id) 
-my_transaction = folder[id]
-
-my_transaction.newContent(portal_type='Accounting Transaction Line',
-                          source='account/creance_client',
-                          id='receivable')
-my_transaction.newContent(portal_type='Accounting Transaction Line',
-                          source='account/dette_fournisseur',
-                          id='payable')
-my_transaction.newContent(portal_type='Accounting Transaction Line',
-                          source='account/banques_etablissements_financiers',
-                          id='bank')
-
-return my_transaction
diff --git a/product/ERP5/skins/erp5_trade/AccountingTransaction_getDestinationPaymentItemList.py b/product/ERP5/skins/erp5_trade/AccountingTransaction_getDestinationPaymentItemList.py
deleted file mode 100755
index db5e53e444db9efebb1f4dea520936216277e48f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/AccountingTransaction_getDestinationPaymentItemList.py
+++ /dev/null
@@ -1,24 +0,0 @@
-## Script (Python) "AccountingTransaction_getDestinationPaymentItemList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-def sort(a, b):
-  return cmp(a[0], b[0])
-
-item_list = [['', '']]
-
-organisation = context.getDestinationSectionValue()
-if organisation is not None:
-  bank_account_list = organisation.contentValues(filter={'portal_type': 'Bank Account'})
-  for bank_account in bank_account_list:
-    url = bank_account.getRelativeUrl()
-    label = bank_account.getIban()
-    item_list.append([label, url])
-
-item_list.sort(sort)
-return item_list
diff --git a/product/ERP5/skins/erp5_trade/AccountingTransaction_getSourcePaymentItemList.py b/product/ERP5/skins/erp5_trade/AccountingTransaction_getSourcePaymentItemList.py
deleted file mode 100755
index 38c6bf1e27919885ca7d76a98d588f1106ad6e08..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/AccountingTransaction_getSourcePaymentItemList.py
+++ /dev/null
@@ -1,24 +0,0 @@
-## Script (Python) "AccountingTransaction_getSourcePaymentItemList"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-def sort(a, b):
-  return cmp(a[0], b[0])
-
-item_list = [['', '']]
-
-organisation = context.getSourceSectionValue()
-if organisation is not None:
-  bank_account_list = organisation.contentValues(filter={'portal_type': 'Bank Account'})
-  for bank_account in bank_account_list:
-    url = bank_account.getRelativeUrl()
-    label = bank_account.getIban()
-    item_list.append([label, url])
-
-item_list.sort(sort)
-return item_list
diff --git a/product/ERP5/skins/erp5_trade/Base_getDescription.py b/product/ERP5/skins/erp5_trade/Base_getDescription.py
deleted file mode 100755
index f9fd647426d6e4dc0393a4961cc6437f28753547..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Base_getDescription.py
+++ /dev/null
@@ -1,39 +0,0 @@
-## Script (Python) "Base_getDescription"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-from string import join
-
-description = context.getComment('')
-return description
-
-# Try to cut the comment without cutting the words 
-# pbl: capital letter are larger, and the test on the length of sentence isn't good ...
-def recursive_string_cut(b,s):
-  l = 80
-  if len(s) < l:
-    return b+s
-  else:
-    c = s[:l].split(' ')
-    if len(c) < 2:
-      # I don't think that a word with more than 80 caracters can exist ... and it can crash the memory
-      return s[:l]
-    else:
-      return recursive_string_cut(b+join(c[:-2],' ')+'\n', join(c[-2:],' ')+s[l:] )
-    
-
-# get all the lines
-description_lines = description.split('\n')
-
-# cut the too long lines
-result_description_lines = map( ( lambda x: recursive_string_cut('',x) ),description_lines)
-
-# recreate a string
-result = join(result_description_lines,'\n')
-
-return result
diff --git a/product/ERP5/skins/erp5_trade/Contact_view.form b/product/ERP5/skins/erp5_trade/Contact_view.form
deleted file mode 100755
index ca274f99ca8955404a669aeff5a1d16a0aa67d45..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Contact_view.form
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Contact</title>
-  <row_length>4</row_length>
-  <name>list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_resource_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>resource</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>event</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">40</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Mail Message', 'Mail Message')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Event</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/DeliveryLine_asCellRange.py b/product/ERP5/skins/erp5_trade/DeliveryLine_asCellRange.py
deleted file mode 100755
index e566514d828960f6cc72bc202c22fc7355c3443e..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/DeliveryLine_asCellRange.py
+++ /dev/null
@@ -1,25 +0,0 @@
-## Script (Python) "DeliveryLine_asCellRange"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-line_ids = context.OrderLine_getMatrixItemlist(base_category_list = ('tax_category', 'coloris', 'variante'), base=1)
-column_ids = context.OrderLine_getMatrixItemlist(base_category_list = ('salary_range','taille',), base=1)
-tab_ids = context.OrderLine_getMatrixItemlist(base_category_list = ('salary_range','tax_category', 'taille','coloris','variante'),
-                                                       base=1, include=0)
-
-line_ids = map(lambda x: x[0], line_ids)
-column_ids = map(lambda x: x[0], column_ids)
-tab_ids = map(lambda x: x[0], tab_ids)
-
-
-if len(tab_ids) is 0:
-  return [line_ids, column_ids]
-elif tab_ids[0] is None:
-  return [line_ids, column_ids]
-else:
-  return [line_ids, column_ids, tab_ids]
diff --git a/product/ERP5/skins/erp5_trade/DeliveryLine_zGetRelatedDestination.zsql b/product/ERP5/skins/erp5_trade/DeliveryLine_zGetRelatedDestination.zsql
deleted file mode 100755
index 8dece5948ea45b8d5bbde6832999d08acac9f034..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/DeliveryLine_zGetRelatedDestination.zsql
+++ /dev/null
@@ -1,24 +0,0 @@
-<dtml-comment>
-title:
-connection_id:erp5_sql_connection
-max_rows:1000
-max_cache:100
-cache_time:10
-class_name:
-class_file:
-</dtml-comment>
-<params>uid</params>
-SELECT DISTINCT
-  catalog.relative_url AS destination,
-  catalog.uid AS destination_uid
-FROM
-  category, movement, catalog
-WHERE
-  category.category_uid = <dtml-sqlvar uid type="int">
-AND
-  category.uid = movement.uid
-AND
-  category.base_category_uid = <dtml-sqlvar expr="portal_categories.delivery.getUid()" type="int">
-AND
-  catalog.uid =  movement.destination_uid
-  
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/DeliveryLine_zGetRelatedQuantity.zsql b/product/ERP5/skins/erp5_trade/DeliveryLine_zGetRelatedQuantity.zsql
deleted file mode 100755
index 3ef8fb1700d19c4756cd74b0d8358e4503bfd3e6..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/DeliveryLine_zGetRelatedQuantity.zsql
+++ /dev/null
@@ -1,22 +0,0 @@
-<dtml-comment>
-title:
-connection_id:erp5_sql_connection
-max_rows:1000
-max_cache:100
-cache_time:10
-class_name:
-class_file:
-</dtml-comment>
-<params>uid</params>
-SELECT
-  SUM(movement.quantity) AS quantity,
-  SUM(movement.target_quantity) AS target_quantity
-FROM
-  category, movement
-WHERE
-  category.category_uid = <dtml-sqlvar uid type="int">
-AND
-  category.uid = movement.uid
-AND
-  category.base_category_uid = <dtml-sqlvar expr="portal_categories.delivery.getUid()" type="int">
-  
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/DeliveryLine_zGetRelatedSource.zsql b/product/ERP5/skins/erp5_trade/DeliveryLine_zGetRelatedSource.zsql
deleted file mode 100755
index 3c355fac502bd90d2b6adadbad89b5431974e66f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/DeliveryLine_zGetRelatedSource.zsql
+++ /dev/null
@@ -1,24 +0,0 @@
-<dtml-comment>
-title:
-connection_id:erp5_sql_connection
-max_rows:1000
-max_cache:100
-cache_time:10
-class_name:
-class_file:
-</dtml-comment>
-<params>uid</params>
-SELECT DISTINCT
-  catalog.relative_url AS source,
-  catalog.uid AS source_uid
-FROM
-  category, movement, catalog
-WHERE
-  category.category_uid = <dtml-sqlvar uid type="int">
-AND
-  category.uid = movement.uid
-AND
-  category.base_category_uid = <dtml-sqlvar expr="portal_categories.delivery.getUid()" type="int">
-AND
-  catalog.uid =  movement.source_uid
-  
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/DeliveryLine_zGetTotal.zsql b/product/ERP5/skins/erp5_trade/DeliveryLine_zGetTotal.zsql
deleted file mode 100755
index 6df107da083cebd0603790724b07458aed77c940..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/DeliveryLine_zGetTotal.zsql
+++ /dev/null
@@ -1,21 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:
-class_file:
-</dtml-comment>
-<params>uid</params>
-SELECT 
-	SUM(quantity) AS total_quantity, 
-	SUM(total_price) AS total_price, 
-	SUM(target_quantity) AS target_total_quantity, 
-	SUM(target_total_price) AS target_total_price, 
-	AVG(price) AS average_price
-FROM catalog, movement
-WHERE 
-	catalog.parent_uid = <dtml-sqlvar uid type="int">
-AND	
-	catalog.uid = movement.uid
diff --git a/product/ERP5/skins/erp5_trade/Delivery_zGetTotal.zsql b/product/ERP5/skins/erp5_trade/Delivery_zGetTotal.zsql
deleted file mode 100755
index 3dfe42fe07eec4f296c1b26fc961d18b182df36b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Delivery_zGetTotal.zsql
+++ /dev/null
@@ -1,29 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:1000
-max_cache:100
-cache_time:0
-class_name:
-class_file:
-</dtml-comment>
-<params>uid
-resource_uid
-variation_text</params>
-SELECT
-	SUM(quantity) AS inventory,
-	SUM(quantity) AS total_quantity,
-	SUM(total_price) AS total_price,
-	SUM(target_quantity) AS target_total_quantity,
-	SUM(target_total_price) AS target_total_price,
-	AVG(price) AS average_price
-FROM movement, catalog
-WHERE
-	movement.delivery_uid = <dtml-sqlvar uid type="int">
-<dtml-if resource_uid>AND	(<dtml-in resource_uid> movement.resource_uid = <dtml-sqlvar sequence-item type="int"><dtml-if sequence-end><dtml-else> OR </dtml-if></dtml-in>)
-</dtml-if><dtml-if variation_text>AND	movement.variation_text = <dtml-sqlvar variation_text type="string">
-</dtml-if>
-AND	movement.is_accountable = 1
-AND	catalog.portal_type <> "Container"
-AND	catalog.portal_type <> "Simulation Movement"
-AND	catalog.uid = movement.uid
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/DeviceModule_viewDeviceList.form b/product/ERP5/skins/erp5_trade/DeviceModule_viewDeviceList.form
deleted file mode 100755
index 27107c689e6312a3e8d1253794db666bc34ada01..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/DeviceModule_viewDeviceList.form
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Device List</title>
-  <row_length>4</row_length>
-  <name>DeviceModule_viewDeviceList</name>
-  <pt>form_list</pt>
-  <action></action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('getId', 'Id'), ('getTitle', 'Title'), ('getIpAddress', 'IP Address'), ('getOperatingSystem', 'Operating System'), ('getOwnerTitle', 'Owner')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Device', 'Device')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">0</select>
-          <selection_name></selection_name>
-          <sort type="list">[('Id', 'Id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>listbox</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/Device_view.form b/product/ERP5/skins/erp5_trade/Device_view.form
deleted file mode 100755
index d123b23f6390f34663151964c8ebbf916b884be4..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Device_view.form
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Device View</title>
-  <row_length>4</row_length>
-  <name>Device_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Identifier</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_operating_system</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Operating System</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_ip_address</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>IP Address</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_root_password</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Password for root</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_owner_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>owner</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>person</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Owner</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/Discount_view.form b/product/ERP5/skins/erp5_trade/Discount_view.form
deleted file mode 100755
index f92c3b080437a7fd98b51d8f96697c1641061ce9..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Discount_view.form
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Remise</title>
-  <row_length>4</row_length>
-  <name>remise_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Discount</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_int_index</id> <type>IntegerField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <end></end>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <start></start>
-          <title>Order No</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_integer">You did not enter an integer.</message>
-          <message name="integer_out_of_range">The integer you entered was out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_discount_type</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Discount Type</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/discount_type/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_immediate_discount</id> <type>CheckBoxField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="int">0</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <title>Discount deduced on invoice</title>
-        </values>
-        <tales>
-          <default>here/getImmediateDiscount</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      <field><id>my_discount_ratio</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Discount Ratio</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_discount</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Total</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/EventModule_viewEventList.form b/product/ERP5/skins/erp5_trade/EventModule_viewEventList.form
deleted file mode 100755
index 66d341f7dfe13be6af9fc40e011515248c613485..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/EventModule_viewEventList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Event</title>
-  <row_length>4</row_length>
-  <name>EventModule_viewEventList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('Type', 'Type'), ('Title', 'Title'), ('getDate', 'Date'), ('getSourceOrganisationTitle', 'Organisation'), ('event_state', 'State')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('Type', 'Type'), ('Title', 'Title'), ('date', 'date'), ('event_state', 'event_state')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Mail Message', 'Mail Message'), ('Phone Call', 'Phone Call'), ('Incoming Fax', 'Incoming Fax'), ('Incoming Letter', 'Incoming Letter')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>event_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Event List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/EventWorkflow_assign.form b/product/ERP5/skins/erp5_trade/EventWorkflow_assign.form
deleted file mode 100755
index 3e16124a6f3a25c57df77a36f77cff9c2dc5f533..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/EventWorkflow_assign.form
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Reply to Mail</title>
-  <row_length>4</row_length>
-  <name>Workflow_order</name>
-  <pt>form_view_dialog</pt>
-  <action>Workflow_statusModify</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_comment</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>Comment</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_default_follow_up</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>follow_up</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>opportunity</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Sale Opportunity', 'Sale Opportunity')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>my_default_follow_up</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>my_workflow_action</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>-</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.REQUEST.workflow_action</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/EventWorkflow_respond.form b/product/ERP5/skins/erp5_trade/EventWorkflow_respond.form
deleted file mode 100755
index 3297fadd5fb2a9918bef8f65bec9042325ce7620..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/EventWorkflow_respond.form
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Reply to Mail</title>
-  <row_length>4</row_length>
-  <name>Workflow_order</name>
-  <pt>form_view_dialog</pt>
-  <action>Workflow_statusModify</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_sender</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">50</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>to</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_reply_subject</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">50</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Subject</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_reply_body</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">35</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>Message</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">90</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>my_workflow_action</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>-</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.REQUEST.workflow_action</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/InternalPackingListLine_view.form b/product/ERP5/skins/erp5_trade/InternalPackingListLine_view.form
deleted file mode 100755
index c816cd0cf1e043af000717652f2cafccf5eb3b21..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/InternalPackingListLine_view.form
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Internal Packing List Line</title>
-  <row_length>4</row_length>
-  <name>order_order_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>resource</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>product</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Product', 'Product')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Product</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_target_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <title>Wanted Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/InternalPackingListModule_viewInternalPackingListList.form b/product/ERP5/skins/erp5_trade/InternalPackingListModule_viewInternalPackingListList.form
deleted file mode 100755
index 375a5875250e9e4a518a1d7eb96044b27b099330..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/InternalPackingListModule_viewInternalPackingListList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Internal Packing List</title>
-  <row_length>4</row_length>
-  <name>InternalPackingListModule_viewInternalPackingListList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('title', 'Title'), ('default_source_title', 'From'), ('default_destination_title', 'To'), ('target_stop_date', 'Wanted Date'), ('start_date', 'Delivery Date')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Internal Packing List', 'Internal Packing List')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">1</select>
-          <selection_name>internal_packing_list_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Internal Packing List List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/InternalPackingList_view.form b/product/ERP5/skins/erp5_trade/InternalPackingList_view.form
deleted file mode 100755
index 4d2314bc05c78de6d336adceb4a526785d42b7b0..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/InternalPackingList_view.form
+++ /dev/null
@@ -1,493 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Internal Packing List</title>
-  <row_length>4</row_length>
-  <name>PurchasePackingList_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_causality_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>causality</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>sale_order</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Sale Order', 'Sales Order')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Order</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_source_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Source Address</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_source_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Source Owner</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Shipped</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Delivered</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_target_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Deliver from</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_target_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Deliver before</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_default_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Destination Address</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Destination Owner</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">4</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">80</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('description', 'Description'), ('resource_title', 'Product'), ('target_quantity', 'Wanted Quantity'), ('quantity', 'Quantity')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('quantity', 'Quantity')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>InternalPackingList_viewInternalPackingListLineList</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">0</select>
-          <selection_name>purchase_packing_list_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Internal Packing List Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/InternalPackingList_viewInternalPackingListLineList.form b/product/ERP5/skins/erp5_trade/InternalPackingList_viewInternalPackingListLineList.form
deleted file mode 100755
index 78e53fbf3313f92414a3c38563f01379aee9de6e..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/InternalPackingList_viewInternalPackingListLineList.form
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Internal Packing List</title>
-  <row_length>4</row_length>
-  <name>accounting_transaction_list</name>
-  <pt>form_list</pt>
-  <action></action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('description', 'Description'), ('resource_title', 'Product'), ('target_quantity', 'Wanted Quantity'), ('quantity', 'Quantity')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Internal Packing List Line', 'Internal Packing List Line')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">1</select>
-          <selection_name>internal_packing_list_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Internal Packing List Line List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/InventoryLine_view.form b/product/ERP5/skins/erp5_trade/InventoryLine_view.form
deleted file mode 100755
index 01cfef0280aaed892f01207515f4907ea3af2622..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/InventoryLine_view.form
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Packing List Line</title>
-  <row_length>4</row_length>
-  <name>order_order_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>resource</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>product</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Product', 'Product')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Product</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_inventory</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Inventory</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/InventoryModule_viewInventoryList.form b/product/ERP5/skins/erp5_trade/InventoryModule_viewInventoryList.form
deleted file mode 100755
index 9683fd79c821a2c2887cc567a6b57ca4b7f12d94..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/InventoryModule_viewInventoryList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Inventory</title>
-  <row_length>4</row_length>
-  <name>InventoryModule_viewInventoryList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('Title', 'Title'), ('description', 'Description')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('id', 'Id'), ('Title', 'Title'), ('description', 'Description')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Inventory', 'Inventory')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>inventory_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Inventory List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/Inventory_fastAddInventoryLine.py b/product/ERP5/skins/erp5_trade/Inventory_fastAddInventoryLine.py
deleted file mode 100755
index a40314d1cfff346aa65aae32d4374be0f1be3c70..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Inventory_fastAddInventoryLine.py
+++ /dev/null
@@ -1,48 +0,0 @@
-## Script (Python) "Inventory_fastAddInventoryLine"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=fast_input
-##title=Add Lines to an Inventory
-##
-from Products.Formulator.Errors import ValidationError, FormValidationError
-
-request=context.REQUEST
-
-try:
-  for line in fast_input:
-    line_items = line.split()
-    if len(line_items) > 1:
-      # Product and quantity
-      line_product = ' '.join(line_items[0:-1])
-      line_quantity = line_items[-1]
-    else:
-      # Product 
-      line_product = line
-    new_id = str(context.generateNewId())
-    context.portal_types.constructContent(type_name="Inventory Line",
-                                                            container=context,
-                                                            id=new_id)
-    resource_list = context.portal_catalog(title=line_product, portal_type='Product', Title=line_product)
-    if len(resource_list) > 0:
-      resource_value = resource_list[0].getObject()
-      if resource_value is not None:
-        context[new_id].edit(inventory=line_quantity ,
-                                     description=line_product ,
-                                     resource_value = resource_value)
-    else:
-      context[new_id].edit( inventory=line_quantity ,
-                                     description=line_product ,
-                                                           )
-except FormValidationError, validation_errors:
-  redirect_url = '%s/view?%s' % ( context.absolute_url()
-                                  , 'portal_status_message=Failed+Fast+Input.'
-                                  )
-else:
-  redirect_url = '%s/view?%s' % ( context.absolute_url()
-                                  , 'portal_status_message=Data+Updated.'
-                                  )
-
-request[ 'RESPONSE' ].redirect( redirect_url )
diff --git a/product/ERP5/skins/erp5_trade/Inventory_view.form b/product/ERP5/skins/erp5_trade/Inventory_view.form
deleted file mode 100755
index 181d79bcf107b988d166b2423df3b937042ba401..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Inventory_view.form
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Packing List</title>
-  <row_length>4</row_length>
-  <name>PurchasePackingList_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Inventory Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Warehouse</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Owner</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">4</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">80</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('description', 'Description'), ('resource_title', 'Product'), ('inventory', 'Inventory')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('inventory', 'Inventory')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">100</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">0</select>
-          <selection_name>purchase_packing_list_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Purchase Packing List Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_inventory</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Inventory</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/Inventory_viewFastInputDialog.form b/product/ERP5/skins/erp5_trade/Inventory_viewFastInputDialog.form
deleted file mode 100755
index 6f69e3d513a68028bdb9a7dc10157cf3fe63c97b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Inventory_viewFastInputDialog.form
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Inventory Fast Input</title>
-  <row_length>4</row_length>
-  <name>Inventory Fast Input</name>
-  <pt>form_dialog</pt>
-  <action>Inventory_fastAddInventoryLine</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype>multipart/form-data</enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_fast_input</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">30</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>Inventory List</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">80</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/InvoiceLine_view.form b/product/ERP5/skins/erp5_trade/InvoiceLine_view.form
deleted file mode 100755
index eaf0c2379c1259f86cfeb1114257245e3e608b73..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/InvoiceLine_view.form
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Invoice Line</title>
-  <row_length>4</row_length>
-  <name>InvoiceLine_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype>multipart/form-data</enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Line Number</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">2</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_resource_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>resource</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>product</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">40</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Product', 'Product'), ('Service', 'Service'), ('Category', 'Category')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Product</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_variation_base_category_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">3</size>
-          <title>Variation Axes</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-          <items>here/getVariationRangeBaseCategoryList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_variation_category_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">8</size>
-          <title>Variations</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-          <items>here/getVariationRangeCategoryItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Quantity by default</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_quantity_unit</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Unit</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/getQuantityUnitRangeItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Price by default</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>spacer</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>-</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_total_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Invoiced Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python: '%.2f' % here.getTotalQuantity()</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_value_added_tax_ratio</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>VAT Ratio</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_value_added_tax_recoverable</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('No', '0'), ('Yes', '1')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>TVA in use</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:str(here.getValueAddedTaxRecoverable())</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/InvoiceLine_viewPrice.form b/product/ERP5/skins/erp5_trade/InvoiceLine_viewPrice.form
deleted file mode 100755
index be84bd4b32be14a41e38c87d7592363ca3a27564..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/InvoiceLine_viewPrice.form
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Price of Invoice Line</title>
-  <row_length>4</row_length>
-  <name>InvoiceLine_viewPrice</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype>multipart/form-data</enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Line Number</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>matrixbox</id> <type>MatrixBox</type>
-        <values>
-          <all_editable_attributes type="list">[('ttarget_quantity', 'target_quantity'), ('quantity', 'quantity'), ('price', 'price'), ('predicate_value', 'predicate_value'), ('variation_category_list', 'variation_category_list')]</all_editable_attributes>
-          <alternate_name></alternate_name>
-          <cell_base_id>movement</cell_base_id>
-          <cell_range type="list">[]</cell_range>
-          <columns type="list">[('None', 'None')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_attributes type="list">[('target_quantity', 'target_quantity'), ('quantity', 'quantity'), ('price', 'price'), ('predicate_value', 'predicate_value'), ('variation_category_list', 'variation_category_list')]</editable_attributes>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <getter_method></getter_method>
-          <global_attributes type="list">[('domain_base_category_list', 'domain_base_category_list'), ('mapped_value_property_list', 'mapped_value_property_list'), ('predicate_operator', 'predicate_operator')]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="list">[('None', 'None')]</lines>
-          <setter_method></setter_method>
-          <tabs type="list">[('None', 'None')]</tabs>
-          <title>matrixbox</title>
-          <update_cell_range type="int">1</update_cell_range>
-        </values>
-        <tales>
-          <columns>python:here.OrderLine_getMatrixItemlist(base_category_list = ('taille',), base=1)</columns>
-          <lines>python:here.OrderLine_getMatrixItemlist(base_category_list = ('coloris','variante'), base=1)</lines>
-          <tabs>python:here.OrderLine_getMatrixItemlist(base_category_list = ('taille','coloris','variante'), base=1, include=0)</tabs>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      <field><id>domain_base_category_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Valid Domain</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>here/getVariationBaseCategoryList</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>predicate_operator</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>SUPERSET_OF</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Operator</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>mapped_value_property_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">['target_quantity', 'quantity', 'price']</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Modified categories</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>matrixbox_predicate_value</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>matrixbox_predicate_value</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>python:cell_index</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox_variation_category_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>matrixbox_predicate_value</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>python:cell_index</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>matrixbox_price</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:cell.getProperty('price')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <required type="int">0</required>
-          <title>matrixbox_quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:cell.getProperty('quantity')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox_target_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <required type="int">0</required>
-          <title>matrixbox_target_quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:cell.getProperty('target_quantity')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/InvoiceLine_viewQuantity.form b/product/ERP5/skins/erp5_trade/InvoiceLine_viewQuantity.form
deleted file mode 100755
index c53e62e7299bdb2055ba25b224fcebe1043f4d62..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/InvoiceLine_viewQuantity.form
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Quantity of Invoice Line</title>
-  <row_length>4</row_length>
-  <name>InvoiceLine_viewQuantity</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype>multipart/form-data</enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Line Number</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>matrixbox</id> <type>MatrixBox</type>
-        <values>
-          <all_editable_attributes type="list">[('quantity', 'quantity'), ('price', 'price'), ('predicate_value', 'predicate_value'), ('variation_category_list', 'variation_category_list')]</all_editable_attributes>
-          <alternate_name></alternate_name>
-          <cell_base_id>movement</cell_base_id>
-          <cell_range type="list">[]</cell_range>
-          <columns type="list">[('None', 'None')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_attributes type="list">[('quantity', 'quantity'), ('price', 'price'), ('predicate_value', 'predicate_value'), ('variation_category_list', 'variation_category_list')]</editable_attributes>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <getter_method></getter_method>
-          <global_attributes type="list">[('domain_base_category_list', 'domain_base_category_list'), ('mapped_value_property_list', 'mapped_value_property_list'), ('predicate_operator', 'predicate_operator')]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="list">[('None', 'None')]</lines>
-          <setter_method></setter_method>
-          <tabs type="list">[('None', 'None')]</tabs>
-          <title>matrixbox</title>
-          <update_cell_range type="int">1</update_cell_range>
-        </values>
-        <tales>
-          <columns>python:here.OrderLine_getMatrixItemlist(base_category_list = ('taille',), base=1)</columns>
-          <lines>python:here.OrderLine_getMatrixItemlist(base_category_list = ('coloris','variante'), base=1)</lines>
-          <tabs>python:here.OrderLine_getMatrixItemlist(base_category_list = ('taille','coloris','variante'), base=1, include=0)</tabs>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      <field><id>domain_base_category_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Valid Domain</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>here/getVariationBaseCategoryList</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>predicate_operator</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>SUPERSET_OF</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Operator</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>mapped_value_property_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">['target_quantity', 'quantity', 'price']</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Modified categories</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>matrixbox_predicate_value</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>matrixbox_predicate_value</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>python:cell_index</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox_variation_category_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>matrixbox_predicate_value</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>python:cell_index</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <required type="int">0</required>
-          <title>matrixbox_price</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:cell.getProperty('price')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>matrixbox_quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:cell.getProperty('quantity')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/Invoice_zGetEscompteDescription.py b/product/ERP5/skins/erp5_trade/Invoice_zGetEscompteDescription.py
deleted file mode 100755
index 7865d5a1d204dfa2f34a7cde1fa1b4692e38452b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Invoice_zGetEscompteDescription.py
+++ /dev/null
@@ -1,25 +0,0 @@
-## Script (Python) "Invoice_zGetEscompteDescription"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-tmp_list = context.contentValues(filter={'portal_type':'Remise', 'discount_type_title':'Escompte'})
-
-escompte_list = filter(lambda item: item.getDiscountType() == 'Escompte', tmp_list)
-
-if escompte_list != []:
-  escompte_object = escompte_list[0]
-  if escompte_object.getDescription() != None: 
-    escompte_description = string.replace(escompte_object.getDescription(),'%','%%')[:45]
-  elif escompte_object.getDiscountRatio() != None:
-    escompte_description = '%.2f' % (escompte_object.getDiscountRatio() * 100) + '%% sous 10 jours'
-  else:
-    escompte_description = '2%% sous 10 jours'
-else:
-  escompte_description = '2%% sous 10 jours'
-
-return escompte_description
diff --git a/product/ERP5/skins/erp5_trade/Invoice_zGetPaymentTime.py b/product/ERP5/skins/erp5_trade/Invoice_zGetPaymentTime.py
deleted file mode 100755
index f83260ebee6bc291466c14cb30548a8f1499a24b..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Invoice_zGetPaymentTime.py
+++ /dev/null
@@ -1,31 +0,0 @@
-## Script (Python) "Invoice_zGetPaymentTime"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-packing_list = context.getCausalityValueList(portal_type=['Sale Packing List','Sales Packing List'])[0]
-
-#order = packing_list.getCausalityValueList(portal_type=['Sale Order','Sales Order'])[0]
-order = packing_list.SalesPackingList_getCausalitySalesOrder()
-payment_term = context.getPaymentTerm(30)
-
-payment_end_of_month = context.getPaymentEndOfMonth()
-
-pat = order.getPaymentAdditionalTerm()
-
-result = '%i jours ' % payment_term
-
-if pat == None:
-  if payment_end_of_month:
-    result += 'en fin de mois'
-  else:
-    result += 'net'
-else:
-  result += 'le %i' % pat
-
-
-return result
diff --git a/product/ERP5/skins/erp5_trade/Invoice_zGetSourceSectionDescription.py b/product/ERP5/skins/erp5_trade/Invoice_zGetSourceSectionDescription.py
deleted file mode 100755
index dea10aeb4a5dfa3b2478533cebffd56d20638886..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Invoice_zGetSourceSectionDescription.py
+++ /dev/null
@@ -1,31 +0,0 @@
-## Script (Python) "Invoice_zGetSourceSectionDescription"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-source_section_title = context.getSourceSectionTitle()
-
-
-case = {
-  'Coramy': ('Coramy', 
-             '5 bis, rue Denis Cordonnier - 59820 Gravelines - Tél. : 33(0)3 28 51 91 51 -  Fax : 33(0)3 28 23 34 96',
-             'MAILLOTS DE BAIN - GYM - SWIMSUITS - FITNESS',
-             'S.A.S. au capital de 435.200 € - T.V.A. FR 67 611 750 274 - R.C. Dunkerque 611 750 274 - SIRET 611 750 274 00023  - CNUF 15971',
-             '40'),
-  'BLS': ('BLS' ,
-          '5 bis, rue Denis Cordonnier - 59820 Gravelines - Tél. : 33(0)3 28 51 86 26 -  Fax : 33(0)3 28 23 34 96', 
-          'LICENSE MAILLOTS DE BAIN DIM FEMME & HOMME',
-          'S.A.R.L. au capital de 10.000 € - T.V.A. FR 51 442 959 243 - R.C. Dunkerque 442 959 243 - SIRET 442 959 243 00019'
-          '60'),
-  'Houvenaegel':('Houvenaegel' , 
-                 '5 bis, rue Denis Cordonnier - 59820 Gravelines - Tél. : 33(0)3 28 51 91 55 -  Fax : 33(0)3 28 23 34 96', 
-                 'MAILLOTS DE BAIN - GYM - SWIMSUITS - FITNESS',
-                 'S.A.R.L. au capital de 7.622,45 € - T.V.A. FR 07 422 769 810 - R.C. Dunkerque 422 769 810 - SIRET 422 769 810 00025',
-                 '20')
-}
-
-return case[ source_section_title ]
diff --git a/product/ERP5/skins/erp5_trade/Invoice_zGetTotal.zsql b/product/ERP5/skins/erp5_trade/Invoice_zGetTotal.zsql
deleted file mode 100755
index 491496a3fbe74b9e834659de96a17f716bbf3804..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Invoice_zGetTotal.zsql
+++ /dev/null
@@ -1,13 +0,0 @@
-<dtml-comment>
-title:
-connection_id:MySQL
-max_rows:100000
-max_cache:100
-cache_time:0
-class_name:ZSQLBrain
-class_file:zsqlbrain.py
-</dtml-comment>
-<params>uid</params>
-SELECT sum(movement.quantity) AS total_quantity, sum(movement.total_price) AS total_price from movement
-WHERE movement.delivery_uid = <dtml-var uid>
-AND movement.has_cell_content = 0
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/Invoice_zGetTotalNetPrice.py b/product/ERP5/skins/erp5_trade/Invoice_zGetTotalNetPrice.py
deleted file mode 100755
index f8158636bfb97221eff0b5bd7081f483b134e5f6..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Invoice_zGetTotalNetPrice.py
+++ /dev/null
@@ -1,23 +0,0 @@
-## Script (Python) "Invoice_zGetTotalNetPrice"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# price = context.getTotalPrice()
-price = context.Invoice_zGetTotal()[0].total_price
-
-discount_list_tmp = context.contentValues(filter={'portal_type':'Remise'})
-discount_list = filter(lambda x: x not in [None,0] ,discount_list_tmp)
-
-if len(discount_list) > 1:
-  discount_list.sort(lambda x,y: cmp(x.getIntIndex(),y.getIntIndex()))
-
-for discount_line in discount_list:
-  if discount_line.getImmediateDiscount():
-    price *= (1 - discount_line.getDiscountRatio())
-
-return price
diff --git a/product/ERP5/skins/erp5_trade/Invoice_zGetTotalVat.py b/product/ERP5/skins/erp5_trade/Invoice_zGetTotalVat.py
deleted file mode 100755
index 6c08aad87f0214d57750fee34ab2187c2bd3acfa..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Invoice_zGetTotalVat.py
+++ /dev/null
@@ -1,21 +0,0 @@
-## Script (Python) "Invoice_zGetTotalVat"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-price = context.Invoice_zGetTotalNetPrice()
-
-if context.getValueAddedTaxRecoverable():
-  vat_ratio = context.getValueAddedTaxRatio()
-  if vat_ratio != None:
-    price *= vat_ratio
-  else:
-    price = 0
-else:
-  price = 0
-
-return price
diff --git a/product/ERP5/skins/erp5_trade/MailMessage_view.form b/product/ERP5/skins/erp5_trade/MailMessage_view.form
deleted file mode 100755
index 856284c1cd27dfe8f7a10541ab802b42bc445238..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/MailMessage_view.form
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Mail Message</title>
-  <row_length>4</row_length>
-  <name>MailMessage_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_sender</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">40</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>From</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_to</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">40</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>To</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_date</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">40</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Date</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">40</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Subject</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_source_person_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>person</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Person</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_organisation_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Organisation</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_follow_up</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>follow_up</base_category>
-          <catalog_index>getRelativeUrl</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>support</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Sale Opportunity', 'Sale Opportunity'), ('Support Request', 'Support Request')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Follow Up</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_default_follow_up_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>follow_up</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>opportunity</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Sale Opportunity', 'Sale Opportunity'), ('Support Request', 'Support Request')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Follow Up</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_simulation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'event_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_body</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">30</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Body</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">90</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('Description', 'Description')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>list</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Image', 'Image'), ('File', 'File')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name></selection_name>
-          <sort type="list">[]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Attachments</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/Movement_lookupPrice.py b/product/ERP5/skins/erp5_trade/Movement_lookupPrice.py
deleted file mode 100755
index b923806a37dc25fd48337e645319f5c2d63014ea..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Movement_lookupPrice.py
+++ /dev/null
@@ -1,15 +0,0 @@
-## Script (Python) "Movement_lookupPrice"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-resource = context.getResourceValue()
-if resource is not None:
-  return resource.getSourceBasePrice(0)/resource.getPricedQuantity()
-  # return resource.getPrice(context=context) # calls a Resource_lookupPrice itself
-else:
-  return None
diff --git a/product/ERP5/skins/erp5_trade/OrderLine_getMatrixItemlist.py b/product/ERP5/skins/erp5_trade/OrderLine_getMatrixItemlist.py
deleted file mode 100755
index d75cc51404fddf26f53264e3047635d0f8a14cf3..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/OrderLine_getMatrixItemlist.py
+++ /dev/null
@@ -1,38 +0,0 @@
-## Script (Python) "OrderLine_getMatrixItemlist"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=base_category_list=[], base=1, include=1
-##title=
-##
-clist = []
-variation_category_list=[]
-
-if include == 1 :
-  for category in context.getVariationBaseCategoryList():
-    if category in base_category_list :
-      variation_category_list.append(category)
-else :
-  for category in context.getVariationBaseCategoryList():
-    if not category in base_category_list :
-      variation_category_list.append(category)
-
-for base_category in variation_category_list :
-    if base_category in ('coloris','morphologie','variante'):
-      title_list = map(lambda x:('/'.join(x.getPhysicalPath()[len(x.portal_categories.getPhysicalPath()):])),
-         context.getValueList(base_category))
-      value_list = context.getCategoryMembershipList(base_category, base=base)
-      for index in range(len(title_list)) :
-        clist += [(value_list[index],title_list[index])]
-    else :
-      title_list = context.getCategoryMembershipList(base_category, base=0)
-      value_list = context.getCategoryMembershipList(base_category, base=base)
-      for  index in range(len(title_list)) :
-        clist += [(value_list[index],title_list[index])]
-
-if len(clist)==0 :
-  clist.append((None,None))
-
-return clist
diff --git a/product/ERP5/skins/erp5_trade/OrderPackingListLine_view.form b/product/ERP5/skins/erp5_trade/OrderPackingListLine_view.form
deleted file mode 100755
index b09ab2f8360384a9cb603ab906d596b322cbaa73..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/OrderPackingListLine_view.form
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Order Packing List Line</title>
-  <row_length>4</row_length>
-  <name>order_order_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>resource</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>product</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Product', 'Product')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Product</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_target_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <title>Wanted Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/OrderPackingListModule_viewOrderPackingListlist.form b/product/ERP5/skins/erp5_trade/OrderPackingListModule_viewOrderPackingListlist.form
deleted file mode 100755
index 11bf24a1ad5716d6309ceb5df71cb9812a612d17..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/OrderPackingListModule_viewOrderPackingListlist.form
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Order Packing List</title>
-  <row_length>4</row_length>
-  <name>accounting_transaction_list</name>
-  <pt>form_list</pt>
-  <action></action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>OrderPackingListModule_viewOrderPackingListlist</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('causality_title', 'Order'), ('default_destination_title', 'Supplier'), ('target_stop_date', 'Wanted Date'), ('start_date', 'Delivery Date')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Order Packing List', 'Order Packing List')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">1</select>
-          <selection_name>order_packing_list_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Order Packing List List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/OrderPackingList_view.form b/product/ERP5/skins/erp5_trade/OrderPackingList_view.form
deleted file mode 100755
index 6e5c03d8af5ac4df9e170c95f968a80ef9fba5a4..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/OrderPackingList_view.form
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Order Packing List</title>
-  <row_length>4</row_length>
-  <name>OrderPackingList_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Supplier</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_causality_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>causality</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>sale_order</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Sale Order', 'Sales Order')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Order</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Delivery Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_target_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">1</required>
-          <time_separator>:</time_separator>
-          <title>Deliver from</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_target_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">1</required>
-          <time_separator>:</time_separator>
-          <title>Deliver before</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">4</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">80</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('description', 'Description'), ('resource_title', 'Product'), ('target_quantity', 'Wanted Quantity'), ('quantity', 'Quantity')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('quantity', 'Quantity')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">0</select>
-          <selection_name>order_packing_list_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Order Packing List Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/OrderWorkflow_action.form b/product/ERP5/skins/erp5_trade/OrderWorkflow_action.form
deleted file mode 100755
index a05a547d93a7c870acaec1b97d0251ecdf217f27..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/OrderWorkflow_action.form
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Validate Workflow Action</title>
-  <row_length>4</row_length>
-  <name>BaseWorkflow_action</name>
-  <pt>form_view_dialog</pt>
-  <action>Workflow_statusModify</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_comment</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>Comment</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Target Shipping Date</title>
-        </values>
-        <tales>
-          <default>python: here.getTargetStartDate()</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Target Delivery Date</title>
-        </values>
-        <tales>
-          <default>python: here.getTargetStopDate()</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>my_workflow_action</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>-</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.REQUEST.workflow_action</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/PackingListWorkflow_userCreateInvoiceTransaction.form b/product/ERP5/skins/erp5_trade/PackingListWorkflow_userCreateInvoiceTransaction.form
deleted file mode 100755
index 013aeadcf5aa8199f060e9fbd497ff8a159c89f4..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PackingListWorkflow_userCreateInvoiceTransaction.form
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Validate Workflow Action</title>
-  <row_length>4</row_length>
-  <name>Workflow_order</name>
-  <pt>form_view_dialog</pt>
-  <action>Workflow_statusModify</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_comment</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>Comment</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_tva_enabled</id> <type>CheckBoxField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="int">0</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <title>TVA ?</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>my_workflow_action</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>-</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.REQUEST.workflow_action</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/PackingList_createInvoiceTransaction.py b/product/ERP5/skins/erp5_trade/PackingList_createInvoiceTransaction.py
deleted file mode 100755
index cff0d223a6799b4af63634f55e9189f12131dc33..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PackingList_createInvoiceTransaction.py
+++ /dev/null
@@ -1,36 +0,0 @@
-## Script (Python) "PackingList_createInvoiceTransaction"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-packing_list = context.getObject()
-packing_list_type = packing_list.getPortalType()
-packing_list_line_type = packing_list_type + ' Line'
-transaction_module = context.getPortalObject().accounting
-transaction_type = packing_list_type.split(' ')[0] + ' Invoice Transaction'
-transaction_line_type = transaction_type + ' Line'
-
-# Create a new transaction
-new_id = str(transaction_module.generateNewId())
-context.portal_types.constructContent(type_name=transaction_type,
-        container=transaction_module,
-        id=new_id,
-        causality_title=context.getTitle(),
-        title = packing_list.getTitle(),
-        target_start_date = packing_list.getStartDate(),
-        target_stop_date = packing_list.getStopDate(),
-       )
-transaction = transaction_module[new_id]
-
-# Create each line
-# If we do this before, each added line will take 20 times more time
-# because of programmable acquisition
-packing_list.edit(
-        source = order.getSource(),
-        destination = order.getDestination(),
-        causality_value = packing_list
-)
diff --git a/product/ERP5/skins/erp5_trade/PackingList_viewAsHTML.pt b/product/ERP5/skins/erp5_trade/PackingList_viewAsHTML.pt
deleted file mode 100755
index 6b38fbb990c9699fff1d884f7a797fbdb6102e30..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PackingList_viewAsHTML.pt
+++ /dev/null
@@ -1,163 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-
-	<head>
-		<meta http-equiv="content-type" content="text/html;charset=ISO-8859-1">
-		<title tal:content="here/getTitle">Nexedi</title>
-
-	</head>
-
-	<body bgcolor="#ffffff"
-                tal:define="client_invoice python:here.getDefaultValue('destination',portal_type=['Organisation','Person']);
-                client_delivery python:here.getDefaultValue('destination',portal_type=['Organisation','Person']);
-
-from_organisation python:here.restrictedTraverse('/nexedi/organisation/nexedi');
-                            order python:here.getDefaultValue('causality',portal_type=['Sale Order']);
-                            buyer python:order.getDefaultValue('contact',portal_type=['Person']);
-                            ordered_lines python:here.objectValues();
-                            total_price python: here.getTotalPrice();
-			    vat python: request.get('vat','0.196');
-                            total_vat python: here.getTotalPrice() * float(vat)">
-
-
-  <table width=100%>
-  <tr>
-    <td align=left tal:content="python: from_organisation.getTitle()"/>
-    <td align=right tal:content="python: 'Tel : %s' % from_organisation.getDefaultTelephone().asText()"/>
-  </tr>
-  <tr>
-    <td tal:content="python: from_organisation.getDefaultAddress().getStreetAddress()"/>
-  </tr>
-  <tr>
-    <td tal:content="python: '%s %s' %
-                             (from_organisation.getDefaultAddress().getZipCode(),
-                             from_organisation.getDefaultAddress().getCity())"/>
-  </tr>
-
-  <tr>
-    <th colspan=3>
-      <h2>INVOICE</h2>
-    </th>
-  </tr>
-
-  </table>
-
-    <table width=100%>
-    <tr>
-      <td align=right tal:content="python: 'Invoice Date : %s' % here.getStartDate()"/>
-    </tr>
-
-    <tr>
-      <td align=right tal:content="python: 'Pay Before : %s' % here.getTargetStartDate()"/>
-    </tr>
-
-    <tr>
-      <td align=right tal:content="python: 'Invoice N° : %s' % here.getId()"/>
-    </tr>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-    </table>
-
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>INVOICE ADDRESS</th>
-      <th align=left><font color=ffffff>DELIVERY ADDRESS</th>
-    </tr>
-
-    <tr>
-      <td align=left tal:content="python: client_invoice.getTitle()"/>
-      <td align=left tal:content="python: client_delivery.getTitle()"/>
-    </tr>
-    <tr>
-      <td align=left tal:content="python: client_invoice.getDefaultAddress().getStreetAddress()"/>
-      <td align=left tal:content="python: client_delivery.getDefaultAddress().getStreetAddress()"/>
-    </tr>
-    <tr>
-      <td align=left tal:content="python: '%s %s' %
-                             (client_invoice.getDefaultAddress().getZipCode(),
-                             client_invoice.getDefaultAddress().getCity())"/>
-      <td align=left tal:content="python: '%s %s' %
-                             (client_delivery.getDefaultAddress().getZipCode(),
-                             client_delivery.getDefaultAddress().getCity())"/>
-    </tr>
-    </table>
-
-    <table width=100%>
-    <tr bgcolor=000000>
-
-     <th align=left><font color=ffffff>N°</th>
-      <th align=left><font color=ffffff>Description</th>
-      <th><font color=ffffff>Quantity</th>
-      <th>&nbsp;</th>
-      <th><font color=ffffff>Unit_Price</th>
-      <th><font color=ffffff>Price</th>
-    </tr>
-
-    <span tal:repeat="ligne ordered_lines">
-    <tr valign=top tal:condition="python:ligne.getQuantity()>0">
-
-      <td align=left tal:content="python:ligne.getId()"></td>
-<!--      <td> </td> -->
-      <td tal:content="python: ligne.getResourceTitle()"></td>
-      <td align=right tal:content="python: '%.0f' % ligne.getQuantity()"></td>
-      <td>n/a</td>
-      <td align=right tal:content="python: '%.0f' % ligne.getPrice()"></td>
-      <td align=right
-         tal:define="line_price python: float(float(ligne.getPrice())*float(ligne.getQuantity()));
-             total_price python: total_price + line_price"
-         tal:content="python: '%.0f' % line_price"></td>
-    </tr>
-    </span>
-
-
-    <tr>
-      <td colspan=6><hr noshade></td>
-    </tr>
-
-    <tr>
-      <th colspan=4 align=right>Total</th>
-      <td colspan=2 align=right tal:content="python: total_price"></td>
-    </tr>
-
-    <tr>
-      <th colspan=4 align=right tal:content="python: 'TVA ' + str(vat) + ' %'"></th>
-      <td colspan=2 align=right tal:content="python: total_vat"></td>
-    </tr>
-
-
-    <tr>
-      <td colspan=3>&nbsp;</td>
-      <td colspan=3><hr noshade></td>
-    </tr>
-
-    <tr>
-      <td colspan=3>A régler dans <b>0</b> jours au plus tard.
-<br><font size="-3">Conditions de réglement: par chèque, à 0 jours date de la facture. Paiement accepté en euros.
-Tout retard de règlement donnera lieu à une pénalité de 1,5% du montant dû par mois.
-Réserve de propriété: nous conservons la pleine propriété des marchandises jusqu'au paiement intégral du prix, des taxes et accessoires.</font></td>
-      <th colspan=2 align=right>Total à payer</th>
-      <th colspan=1 align=right tal:content="python: total_price + total_vat"></th>
-    </tr>
-
-    <tr>
-      <td>&nbsp;</td>
-    </tr>
-
-    </table>
-
-<table width="100%">
-<tr>
-       <td><center><h6>RCS Roubaix Tourcoing 440 047 504<br>
- Banque:&nbsp;30027&nbsp;Guichet:&nbsp;00039&nbsp;Compte:&nbsp;00000013323&nbsp;RIB:&nbsp;36<br>IBAN: FR76 3002 7175 3900 0410 2760 135<br>
-VAT FR72440047504</h6></center></td>
-</tr>
-</table>
-
-
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/PaymentCondition_view.form b/product/ERP5/skins/erp5_trade/PaymentCondition_view.form
deleted file mode 100755
index 3fe89b6224bbb78d9e655aa76fe502630ae5c1a7..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PaymentCondition_view.form
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Condition de paiement</title>
-  <row_length>4</row_length>
-  <name>condition_paiement_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Payment</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_payment_ratio</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Percentage of total</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_payment_amount</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Total</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_payment_mode</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Payment Mode</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/payment_mode/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_payment_term</id> <type>IntegerField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <end></end>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <start></start>
-          <title>Payment Delay (days)</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_integer">You did not enter an integer.</message>
-          <message name="integer_out_of_range">The integer you entered was out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_payment_end_of_month</id> <type>CheckBoxField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="int">0</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <title>Payment at the end of month</title>
-        </values>
-        <tales>
-          <default>here/getPaymentEndOfMonth</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      <field><id>my_payment_additional_term</id> <type>IntegerField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <end></end>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <start></start>
-          <title>Supplemental Delay (days)</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_integer">You did not enter an integer.</message>
-          <message name="integer_out_of_range">The integer you entered was out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_trade_date</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Reference Date</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/trade_date/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/Pricing_view.form b/product/ERP5/skins/erp5_trade/Pricing_view.form
deleted file mode 100755
index ce3385b5f519fbe4c3731dab30aff9fdfc635bb1..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Pricing_view.form
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Elment tarif</title>
-  <row_length>4</row_length>
-  <name>element_tarfi_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Elment</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_base_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Prix de vente par dfaut</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity_range_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">5</size>
-          <title>Plages de quantit</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-        </values>
-        <tales>
-          <items>python:here.portal_categories.quantity_range.getBaseItemList(base=0)</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox</id> <type>MatrixBox</type>
-        <values>
-          <all_editable_attributes type="list">[('destination_base_price', 'Price'), ('predicate_value', 'predicate_value')]</all_editable_attributes>
-          <alternate_name></alternate_name>
-          <cell_base_id>destination_base_price</cell_base_id>
-          <cell_range type="list">[]</cell_range>
-          <columns type="list">[('300', '300'), ('1000', '1000'), ('5000', '5000')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_attributes type="list">[('destination_base_price', 'Price'), ('predicate_value', 'predicate_value')]</editable_attributes>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <getter_method></getter_method>
-          <global_attributes type="list">[('mapped_value_property_list', 'mapped_value_property_list'), ('predicate_operator', 'predicate_operator'), ('domain_base_category_list', 'domain_base_category_list')]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="list">[('None', 'None')]</lines>
-          <setter_method></setter_method>
-          <tabs type="list">[]</tabs>
-          <title>Prix par quantits</title>
-          <update_cell_range type="int">0</update_cell_range>
-        </values>
-        <tales>
-          <columns>python:here.portal_categories.getItemList(here.getQuantityRangeList())</columns>
-          <lines>python:((None,None),)</lines>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_taille_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">5</size>
-          <title>Plage de tailles</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-        </values>
-        <tales>
-          <default>here/getTailleList</default>
-          <items>here/portal_categories/taille/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_default_taille</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Taille centrale</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/taille/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_commentaires</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">2</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Commentaires</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">80</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>matrixbox_destination_base_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>cell/destination_base_price | string:</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox_predicate_value_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>matrixbox_predicate_value</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-          <default>python:('quantity_range/'+cell_index[1],)</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>matrixbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>matrixbox_title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>cell/getTitle | string:</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>domain_base_category_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">['quantity_range']</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Valid Domain</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>mapped_value_property_list</id> <type>LinesField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">['destination_base_price']</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Modified categories</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;
-</view_separator>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>predicate_operator</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>SUPERSET_OF</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">1</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Operator</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/ProductModule_viewProductList.form b/product/ERP5/skins/erp5_trade/ProductModule_viewProductList.form
deleted file mode 100755
index 449d4b6680ae79cfa79588bb3d10cf89e28a59c1..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/ProductModule_viewProductList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Product</title>
-  <row_length>4</row_length>
-  <name>ProductModule_viewProductList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('Description', 'Description'), ('Title', 'Title'), ('validation_state', 'State')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Product', 'Product')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>product_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Product List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/Product_view.form b/product/ERP5/skins/erp5_trade/Product_view.form
deleted file mode 100755
index 5b05b0da6ebb867e4aeb2299163891048b78ad2f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Product_view.form
+++ /dev/null
@@ -1,426 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Product</title>
-  <row_length>4</row_length>
-  <name>Product_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Supplier</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity_unit</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Unit</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/quantity_unit/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>validation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'validation_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_base_height</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Height (cm)</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_base_length</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Length (cm)</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_base_weight</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Weight (g)</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_base_width</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Width (cm)</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_base_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Nexedi Price</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_priced_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Priced Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getPricedQuantity</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_source_base_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Supplier price</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_source_base_price_validity</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>dmy</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Price Valid Until</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/PublicationWorkflow_validate.form b/product/ERP5/skins/erp5_trade/PublicationWorkflow_validate.form
deleted file mode 100755
index 668e878838efb8d9427676016b34d5f743ec293f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PublicationWorkflow_validate.form
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Offer Sales</title>
-  <row_length>4</row_length>
-  <name>SalesOpportunityWorkflow_offer</name>
-  <pt>form_view_dialog</pt>
-  <action>Workflow_statusModify</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>Default</title>
-      <fields>
-
-      <field><id>my_comment</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">1</required>
-          <title>Comment</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_workflow_action</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default>offer</default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>workflow_action</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/PurchaseInvoiceTransactionLine_view.form b/product/ERP5/skins/erp5_trade/PurchaseInvoiceTransactionLine_view.form
deleted file mode 100755
index 30d6612b365e6134d4d5ef0ef79ca4ea56a5cdea..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PurchaseInvoiceTransactionLine_view.form
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Invoice Transaction Line</title>
-  <row_length>4</row_length>
-  <name>purchase_invoice_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>my_title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <title>my_quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Source1', 'Source1'), ('Source2', 'Source2')]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>my_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Destination1', 'Destination1'), ('Destination2', 'Destination2')]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>my_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/PurchaseInvoiceTransaction_view.form b/product/ERP5/skins/erp5_trade/PurchaseInvoiceTransaction_view.form
deleted file mode 100755
index eef1b93052fffb809c2eaff14d0f87714efec2ab..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PurchaseInvoiceTransaction_view.form
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Invoice Transaction</title>
-  <row_length>4</row_length>
-  <name>purchase_invoice_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Person', 'Person'), ('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Destination Section</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_section</base_category>
-          <catalog_index>id</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>person</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Person', 'Person'), ('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Source Section</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">1</required>
-          <time_separator>:</time_separator>
-          <title>my_start_date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">1</required>
-          <time_separator>:</time_separator>
-          <title>my_stop_date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('currency/EUR', 'currency/EUR'), ('currency/USD', 'currency/USD')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:map(lambda x: (x.id,'currency/%s' % x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('title', 'Title'), ('quantity', 'Price'), ('source', 'Source'), ('destination', 'Destination')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('title', 'Title'), ('quantity', 'Price'), ('source', 'Source'), ('destination', 'Destination')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">1</select>
-          <selection_name>purchase_invoice_transaction_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Purchase Invoice Transaction Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Source1', 'Source1'), ('Source2', 'Source2')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Destination1', 'Destination1'), ('Destination2', 'Destination2')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/PurchaseOrderLine_view.form b/product/ERP5/skins/erp5_trade/PurchaseOrderLine_view.form
deleted file mode 100755
index bef57fd6c122de5e9a529d0350b12143477ce2b5..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PurchaseOrderLine_view.form
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Order Line</title>
-  <row_length>4</row_length>
-  <name>PurchaseOrderLine_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_resource_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>resource</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>product</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">40</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Product', 'Product')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Product</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_quantity_unit</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Unit</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/quantity_unit/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Purchases Price</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/PurchaseOrderModule_viewPurchaseOrderList.form b/product/ERP5/skins/erp5_trade/PurchaseOrderModule_viewPurchaseOrderList.form
deleted file mode 100755
index aafbd79c95ec655589cf8dd69fdb8feed1dc6b79..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PurchaseOrderModule_viewPurchaseOrderList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Order</title>
-  <row_length>4</row_length>
-  <name>PurchaseOrderModule_viewPurchaseOrderList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('default_destination_title', 'Supplier'), ('default_destination_decision_title', 'Buyer'), ('description', 'Description'), ('title', 'Title'), ('stop_date', 'Date')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Purchase Order', 'Purchase Order')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>purchase_order_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Purchase Order List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/PurchaseOrder_view.form b/product/ERP5/skins/erp5_trade/PurchaseOrder_view.form
deleted file mode 100755
index 71b69af3fc0f86ef742ce72bb0635534df682884..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PurchaseOrder_view.form
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchases Order</title>
-  <row_length>4</row_length>
-  <name>accounting_transaction_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_target_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">1</required>
-          <time_separator>:</time_separator>
-          <title>Shipping Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_target_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">1</required>
-          <time_separator>:</time_separator>
-          <title>Delivery Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Supplier</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_decision_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_decision</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>person</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Buyer</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">80</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('resource', 'Product'), ('description', 'Description'), ('quantity', 'Quantity'), ('quantity_unit', 'Unit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('quantity', 'Quantity'), ('quantity_unit', 'Unit')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">0</select>
-          <selection_name>sale_order_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Sale Order Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_quantity_unit</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Unit</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/quantity_unit/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/PurchasePackingListLine_view.form b/product/ERP5/skins/erp5_trade/PurchasePackingListLine_view.form
deleted file mode 100755
index af522f9ed4d53fea85fa8fe2aa561dab63dad2cc..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PurchasePackingListLine_view.form
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Packing List Line</title>
-  <row_length>4</row_length>
-  <name>order_order_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>resource</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>product</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Product', 'Product')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Product</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_target_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <title>Wanted Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/PurchasePackingListModule_viewPurchasePackingListList.form b/product/ERP5/skins/erp5_trade/PurchasePackingListModule_viewPurchasePackingListList.form
deleted file mode 100755
index abe2dd2d0ea941bf2f2c0866a39bd1861d623c71..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PurchasePackingListModule_viewPurchasePackingListList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Packing List</title>
-  <row_length>4</row_length>
-  <name>PurchasePackingListModule_viewPurchasePackingListList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('causality_title', 'Order'), ('default_destination_title', 'Supplier'), ('target_stop_date', 'Wanted Date'), ('start_date', 'Delivery Date')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Purchase Packing List', 'Purchase Packing List')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>purchase_packing_list_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Purchase Packing List List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/PurchasePackingList_view.form b/product/ERP5/skins/erp5_trade/PurchasePackingList_view.form
deleted file mode 100755
index 4923496c3d9ca8195d4d00b70a2f1544446c1c36..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/PurchasePackingList_view.form
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Purchase Packing List</title>
-  <row_length>4</row_length>
-  <name>PurchasePackingList_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Supplier</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_causality_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>causality</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>sale_order</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Sale Order', 'Sales Order')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Order</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Delivery Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_target_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">1</required>
-          <time_separator>:</time_separator>
-          <title>Deliver from</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_target_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">1</required>
-          <time_separator>:</time_separator>
-          <title>Deliver before</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">4</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">80</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('description', 'Description'), ('resource_title', 'Product'), ('target_quantity', 'Wanted Quantity'), ('quantity', 'Quantity')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('quantity', 'Quantity')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">0</select>
-          <selection_name>purchase_packing_list_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Purchase Packing List Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/SaleInvoiceTransactionLine_view.form b/product/ERP5/skins/erp5_trade/SaleInvoiceTransactionLine_view.form
deleted file mode 100755
index 9fac4acfd598da6d20b36e1d2f885d30bc795ee3..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SaleInvoiceTransactionLine_view.form
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Invoice Transaction Line</title>
-  <row_length>4</row_length>
-  <name>purchase_invoice_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>my_title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <title>my_quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Source1', 'Source1'), ('Source2', 'Source2')]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>my_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Destination1', 'Destination1'), ('Destination2', 'Destination2')]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>my_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_getDueDate.py b/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_getDueDate.py
deleted file mode 100755
index e232c8786dca7b1a23f93be81168d34476aa189c..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_getDueDate.py
+++ /dev/null
@@ -1,43 +0,0 @@
-## Script (Python) "SaleInvoiceTransaction_getDueDate"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-packing_list_list = context.getCausalityValueList(portal_type=['Sale Packing List','Sales Packing List'])
-
-if len(packing_list_list) > 0:
-  packing_list = context.getCausalityValueList(portal_type=['Sale Packing List','Sales Packing List'])[0]
-  order = packing_list.SalesPackingList_getCausalitySalesOrder()
-  from DateTime import DateTime
-  due_date = packing_list.getTargetStopDate( DateTime() )
-  pat = order.getPaymentAdditionalTerm()
-else:
-  due_date = context.getStartDate()
-  pat = None
-
-due_date += context.getPaymentTerm(30)
-peom = context.getPaymentEndOfMonth()
-
-if peom:
-  i = 0
-  month = due_date.month()
-  while (month == (due_date + i).month()):
-    i += 1
-  due_date = (due_date + i - 1)
-
-  if pat != None:
-    due_date += pat
-
-else:
-  if pat != None:
-    i = 0
-    month = due_date.month()
-    while (month == (due_date + i).month()):
-      i -= 1
-    due_date = (due_date + i + pat)
-
-return due_date
diff --git a/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_view.form b/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_view.form
deleted file mode 100755
index faf3d4d67b66b519a189358ffcf93a05c7e52f30..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_view.form
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Invoice Transaction</title>
-  <row_length>4</row_length>
-  <name>purchase_invoice_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Person', 'Person'), ('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Destination Section</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_section</base_category>
-          <catalog_index>id</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>person</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Person', 'Person'), ('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Source Section</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">1</required>
-          <time_separator>:</time_separator>
-          <title>my_start_date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">0</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">1</required>
-          <time_separator>:</time_separator>
-          <title>my_stop_date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('currency/EUR', 'currency/EUR'), ('currency/USD', 'currency/USD')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:map(lambda x: (x.id,'currency/%s' % x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('title', 'Title'), ('quantity', 'Price'), ('source', 'Source'), ('destination', 'Destination')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('title', 'Title'), ('quantity', 'Price'), ('source', 'Source'), ('destination', 'Destination')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">1</select>
-          <selection_name>purchase_invoice_transaction_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Sale Invoice Transaction Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Source1', 'Source1'), ('Source2', 'Source2')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('Destination1', 'Destination1'), ('Destination2', 'Destination2')]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_viewAccounting.form b/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_viewAccounting.form
deleted file mode 100755
index bed8f437f9a4f6929df9db0610ee6ba6ca1b742a..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_viewAccounting.form
+++ /dev/null
@@ -1,568 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Invoice Transaction</title>
-  <row_length>4</row_length>
-  <name>sale_invoice_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_source_section</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Vendor</title>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: [['Nexedi', 'organisation/nexedi']]</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <read_only type="int">0</read_only>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Customer</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">1</read_only>
-          <required type="int">0</required>
-          <title>Invoice Number</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[('','')]+map(lambda x:(x.id,'currency/%s' %x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">1</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Invoice Date</title>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>simulation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">1</read_only>
-          <required type="int">0</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'simulation_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">0</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Customer Transaction Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('source', 'Account'), ('source_debit', 'Debit'), ('source_credit', 'Credit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('source_debit', 'Debit'), ('source_credit', 'Credit'), ('source', 'Source')]</editable_columns>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[('resource', 'resource')]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">AccountingTransaction_searchInvoiceTransactionLines</list_method>
-          <meta_types type="list">[]</meta_types>
-          <not_viewable type="int">0</not_viewable>
-          <portal_types type="list">[('Sale Invoice Transaction Line', 'Sale Invoice Transaction Line'), ('Accounting Transaction Line', 'Accounting Transaction Line')]</portal_types>
-          <read_only type="int">0</read_only>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>purchase_invoice_transaction_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Sale Invoice Transaction Lines</title>
-          <url_columns></url_columns>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_viewAsHTML.pt b/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_viewAsHTML.pt
deleted file mode 100755
index dc8c8f877e5caa27bbcec11a6639b2ad37d53119..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_viewAsHTML.pt
+++ /dev/null
@@ -1,171 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-
-	<head>
-		<meta http-equiv="content-type" content="text/html;charset=UTF-8">
-		<title tal:content="here/getTitle">Nexedi</title>
-
-	</head>
-
-	<body bgcolor="#ffffff"
-                tal:define="packing_list python:here.getDefaultValue('causality',spec=['Sale Packing List']);
-                invoice_line_list python:here.contentValues(filter={'portal_type':'Invoice Line'});
-                from_organisation python:here.restrictedTraverse('/nexedi/organisation/nexedi');
-                client_invoice python:here.getDefaultValue('destination_section',spec=['Organisation', 'Person']);
-                client_delivery python:here.getDefaultValue('destination_section',spec=['Organisation', 'Person']);
-                total_price python:here.getDefaultTotalPrice()">
-
-
-  <table width=100%>
-    <tr>
-      <td colspan=3><img src="logo.png"></td>
-    </tr>
-    <tr>
-      <td align=left tal:content="python: from_organisation.getCorporateName()" colspan="2" />
-      <td align=right tal:content="python: 'Invoice / Date Facture: %s' % here.getStartDate().ISO()"/>
-    </tr>
-    <tr>
-      <td align=left tal:content="python: 'Tel: %s' % from_organisation.getDefaultTelephone().asText()" colspan="2"/>
-      <td align=right tal:content="python: 'Pay Before / Payer avant: %s' % here.SaleInvoiceTransaction_getDueDate().ISO()"/>
-    </tr>
-    <tr>
-      <td tal:content="python: from_organisation.getDefaultAddress().getStreetAddress()" colspan="2"/>
-      <td align=right tal:content="python: 'Invoice / Facture No: ERP5/%s' % here.getId()"/>
-    </tr>
-    <tr>
-      <td tal:content="python: '%s %s' %
-                              (from_organisation.getDefaultAddress().getZipCode(),
-                              from_organisation.getDefaultAddress().getCity())" colspan="3"/>
-    </tr>
-    <tr>
-      <td tal:content="python: from_organisation.getDefaultAddress().getRegionTitle()" colspan="3"/>
-    </tr>
-
-    <tr>
-      <th colspan=3>
-        <h2>INVOICE / FACTURE</h2>
-      </th>
-    </tr>
-
-    </table>
-
-    <br/>
-
-      <table width=100%>
-      <tr bgcolor=000000>
-        <th align=left><font color=ffffff size=-2>INVOICE ADDRESS / ADRESSE FACTURATION</font></th>
-        <th align=left><font color=ffffff size=-2>DELIVERY ADDRESS / ADRESSE LIVRAISON </font></th>
-      </tr>
-
-      <tr>
-        <td align=left tal:content="client_invoice/getCorporateName | client_invoice/getTitle"/>
-        <td align=left tal:content="client_delivery/getCorporateName | client_delivery/getTitle"/>
-      </tr>
-      <tr>
-        <td align=left tal:content="python: client_invoice.getDefaultAddress().getStreetAddress()" tal:on-error="nothing"/>
-        <td align=left tal:content="python: client_delivery.getDefaultAddress().getStreetAddress()" tal:on-error="nothing"/>
-      </tr>
-      <tr>
-        <td align=left>
-          <tal:block tal:replace="python: client_invoice.getDefaultAddress().getZipCode()" tal:on-error="nothing"/>
-          <tal:block tal:replace="python: client_invoice.getDefaultAddress().getCity()" tal:on-error="nothing"/>
-        </td>
-        <td align=left>
-          <tal:block tal:replace="python: client_delivery.getDefaultAddress().getZipCode()" tal:on-error="nothing"/>
-          <tal:block tal:replace="python: client_delivery.getDefaultAddress().getCity()" tal:on-error="nothing"/>
-        </td>
-      </tr>
-      <tr>
-        <td align=left tal:content="python: client_invoice.getDefaultAddress().getRegionTitle()" tal:on-error="nothing"/>
-        <td align=left tal:content="python: client_delivery.getDefaultAddress().getRegionTitle()" tal:on-error="nothing"/>
-      </tr>
-      </table>
-
-    <br/>
-
-      <table width=100%>
-        <tr bgcolor=000000>
-          <th align=left nowrap><font color=ffffff size=-2>Nbr / No</font></th>
-          <th align=left nowrap><font color=ffffff size=-2>Description</font></th>
-          <th nowrap><font color=ffffff size=-2>Qty / Qt�</th>
-          <th nowrap><font color=ffffff size=-2>Unit</font></th>
-          <th nowrap><font color=ffffff size=-2>Price / Prix Unit.</font></th>
-          <th nowrap><font color=ffffff size=-2>Price / Prix Total</font></th>
-        </tr>
-        <tal:block tal:condition="python: packing_list is not None">
-          <span tal:define="ordered_line_list python:packing_list.contentValues(filter={'portal_type':'Delivery Line'})"
-                tal:repeat="line ordered_line_list">
-            <tr valign=top tal:condition="python:line.getQuantity()>0">
-
-              <td align=left tal:content="python:line.getId()"></td>
-        <!--      <td> </td> -->
-              <td tal:content="python: line.getResourceTitle()" tal:condition="python: line.getDescription() == ''"></td>
-              <td tal:content="python: line.getDescription()" tal:condition="python: line.getDescription() != ''"></td>
-              <td align=right tal:content="python: '%.0f' % line.getQuantity()"></td>
-              <td align=right tal:content="python: line.getQuantityUnitTitle() or line.getQuantityUnit()">n/a</td>
-              <td align=right tal:content="python: '%.02f' % line.getPrice()"></td>
-              <td align=right tal:content="python: '%.02f' % line.getTotalPrice()"></td>
-            </tr>
-          </span>
-        </tal:block>
-        <tal:block tal:condition="python: invoice_line_list is not None">
-          <tal:block tal:repeat="line invoice_line_list">
-            <tr valign=top tal:condition="python:line.getQuantity() not in (0.0, -0.0, 0)">
-
-              <td align=left tal:content="python:line.getId()"></td>
-        <!--      <td> </td> -->
-              <td tal:content="python: line.getResourceTitle()" tal:condition="python: line.getDescription() == ''"></td>
-              <td tal:content="python: line.getDescription()" tal:condition="python: line.getDescription() != ''"></td>
-              <td align=right tal:content="python: '%.0f' % line.getQuantity()"></td>
-              <td align=right tal:content="python: line.getQuantityUnitTitle() or line.getQuantityUnit()">n/a</td>
-              <td align=right tal:content="python: '%.02f' % line.getPrice()"></td>
-              <td align=right tal:content="python: '%.02f' % line.getTotalPrice()"></td>
-            </tr>
-          </tal:block>
-        </tal:block>
-        <tr>
-          <td colspan=6><hr noshade></td>
-        </tr>
-        <tr>
-          <th colspan=5 align=right>Total
-            (<span tal:replace="here/income/getResourceId | nothing"/>)</th>
-          <td colspan=1 align=right tal:content="python: '%.02f' % round(here.getTotalPrice(), 2)" tal:on-error="nothing"></td>
-        </tr>
-        <tr>
-          <td colspan=2 align=left tal:content="python:here.getDescription()"></td>
-          <th colspan=3 align=right>TVA / VAT<br> <tal:block tal:replace="python: (here.getValueAddedTaxRatio() or 0.0) * 100.0"/> % (<span tal:replace="here/income/getResourceId | nothing"/>)</th>
-          <td colspan=1 align=right tal:content="python: '%.02f' % round(here.Invoice_zGetTotalVat(), 2)" tal:on-error="nothing"></td>
-        </tr>
-        <tr>
-          <td colspan=3>&nbsp;</td>
-          <td colspan=3><hr noshade></td>
-        </tr>
-        <tr>
-          <td colspan=3>A r�gler dans <b tal:content="python: here.getPaymentTerm(30)">0</b> jours au plus tard.
-    <br><font size="-3">Conditions de r�glement: par ch�que ou virement, � <b tal:replace="python: here.getPaymentTerm(30)">0</b> jours date de la facture. Paiement accept� en euros.
-    Tout retard de r�glement donnera lieu � une p�nalit� de 1,5% du montant d� par mois.
-    R�serve de propri�t� nous conservons la pleine propri�t� des marchandises jusqu'au paiement int�gral du prix, des taxes et accessoires.</font></td>
-
-          <th colspan=2 align=right nowrap>Montant Total<br>Total Amount
-            (<span tal:replace="here/income/getResourceId | nothing"/>)</th>
-          <th colspan=1 align=right tal:content="python: '%.02f' % (round(here.Invoice_zGetTotalVat(), 2) + round(here.Invoice_zGetTotalNetPrice(), 2))" tal:on-error="nothing"></th>
-        </tr>
-        <tr>
-          <td>&nbsp;</td>
-        </tr>
-      </table>
-
-  <table width="100%">
-  <tr>
-        <td><center><h6>RCS Roubaix Tourcoing 440 047 504<br>
-  Banque:&nbsp;30027&nbsp;Guichet:&nbsp;17503&nbsp;Compte:&nbsp;00065894401&nbsp;RIB:&nbsp;62<br>IBAN: FR76 3002 7175 0300 0658 9440 162<br>
-	 
-  VAT FR72440047504</h6></center></td>
-    </tr>
-  </table>
-
-
-</body>
-
-</html>
diff --git a/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_viewInvoice.form b/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_viewInvoice.form
deleted file mode 100755
index 7ef10f8caada6d35fc68faad3cf566ac1aa396a9..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SaleInvoiceTransaction_viewInvoice.form
+++ /dev/null
@@ -1,728 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Invoice Transaction</title>
-  <row_length>4</row_length>
-  <name>sale_invoice_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Identity</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_section</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Vendor</title>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: [['Nexedi', 'organisation/nexedi']]</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">1</read_only>
-          <required type="int">0</required>
-          <title>Invoice Reference</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">3</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_source_administration_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_administration</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>person</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Sale Manager</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>dmy</input_order>
-          <input_style>text</input_style>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Invoice Date</title>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_price_currency</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Currency</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:[('','')]+map(lambda x:(x.id,'currency/%s' %x.id),here.currency.objectValues())</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>simulation_state</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">0</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">1</read_only>
-          <required type="int">0</required>
-          <title>State</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>python:here.portal_workflow.getInfoFor(here, 'simulation_state')</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_causality_id</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>causality</base_category>
-          <catalog_index>id</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>sale_packing_list</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <portal_type type="list">[('Sale Packing List', 'Sale Packing List')]</portal_type>
-          <read_only type="int">0</read_only>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Packing List No</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Deliver to</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <not_viewable type="int">0</not_viewable>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <read_only type="int">0</read_only>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>For the account of</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_value_added_tax_recoverable</id> <type>CheckBoxField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="int">0</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <title>VAT in use</title>
-        </values>
-        <tales>
-          <default>here/getValueAddedTaxRecoverable</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      <field><id>my_value_added_tax_ratio</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>VAT ratio</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_incoterm</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Incoterm</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:here.portal_categories.incoterm.getCategoryChildItemList(display_id = 'getTitle', display_none_category=1)</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_delivery_mode</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Delivery Mode</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/delivery_mode/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('resource_title', 'Resource'), ('quantity', 'Quantity'), ('quantity_unit', 'Unit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('quantity', 'quantity')]</editable_columns>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <not_viewable type="int">0</not_viewable>
-          <portal_types type="list">[('Invoice Line', 'Invoice Line')]</portal_types>
-          <read_only type="int">0</read_only>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>sale_invoice_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Sale Invoice Transaction Lines</title>
-          <url_columns></url_columns>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_source</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getSourceItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_destination</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>listbox_destination</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python:cell.getObject().InvoiceTransactionLine_getDestinationItemList()</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_debit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_source_credit</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">5</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>listbox_source_debit</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/SaleOrderLine_view.form b/product/ERP5/skins/erp5_trade/SaleOrderLine_view.form
deleted file mode 100755
index c2124187c0f7b4cae11e51272618c58f158f5ab9..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SaleOrderLine_view.form
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Order Line</title>
-  <row_length>4</row_length>
-  <name>SaleOrderModule_viewSaleOrderList</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_resource_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>resource</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>product</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">40</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Product', 'Product'), ('Service', 'Service')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Product or Service</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_quantity_unit</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Unit</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/quantity_unit/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Sale Price</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/SaleOrderModule_viewSaleOrderList.form b/product/ERP5/skins/erp5_trade/SaleOrderModule_viewSaleOrderList.form
deleted file mode 100755
index 96a9fe3035f7c6c0b9f29fba26fe599a0c4a5efc..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SaleOrderModule_viewSaleOrderList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Order List</title>
-  <row_length>4</row_length>
-  <name>SaleOrderModule_viewSaleOrderList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('default_destination_title', 'Client'), ('default_destination_decision_title', 'Buyer'), ('description', 'Description'), ('title', 'Title'), ('order_state', 'State'), ('stop_date', 'Date')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Sale Order', 'Sale Order')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>sale_order_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Sale Order List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/SaleOrder_view.form b/product/ERP5/skins/erp5_trade/SaleOrder_view.form
deleted file mode 100755
index 98ea18d2d0e619782f82ae003a77442c9586378e..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SaleOrder_view.form
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Order</title>
-  <row_length>4</row_length>
-  <name>accounting_transaction_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_target_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Shipping Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_target_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Delivery Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Client</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_decision_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_decision</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>person</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Person', 'Person'), ('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Buyer</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">4</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">80</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('resource_title', 'Product'), ('description', 'Description'), ('quantity', 'Quantity'), ('quantity_unit', 'Unit')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('quantity', 'Quantity'), ('quantity_unit', 'Unit')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns></search_columns>
-          <select type="int">0</select>
-          <selection_name>sale_order_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Sale Order Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_quantity_unit</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Unit</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/quantity_unit/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/SaleOrder_viewSaleOrderAsHTML.pt b/product/ERP5/skins/erp5_trade/SaleOrder_viewSaleOrderAsHTML.pt
deleted file mode 100755
index 33d61b9266657133471e56b3502402e8dab88c3f..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SaleOrder_viewSaleOrderAsHTML.pt
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html>
-
-	<head>
-		<meta http-equiv="content-type" content="text/html;charset=ISO-8859-1">
-		<title tal:content="here/getTitle">Nexedi</title>
-
-	</head>
-
-	<body bgcolor="#ffffff"
-                tal:define="from_organisation python:here.restrictedTraverse('/nexedi/organisation/nexedi');
-                client_invoice python:here.getDefaultValue('destination',spec=['Organisation', 'Person']);
-                client_delivery python:here.getDefaultValue('destination',spec=['Organisation', 'Person']);
-                order_line_list python:here.contentValues(filter={'portal_type':'Sale Order Line'});
-                total_price python:here.getDefaultTotalPrice()">
-
-
-  <table width=100%>
-    <tr>
-      <td colspan=3><img src="logo.png"></td>
-    </tr>
-    <tr>
-      <td align=left tal:content="python: from_organisation.getCorporateName()" colspan="2" />
-      <td align=right tal:content="python: 'Shipping Date: %s' % here.getStartDate()"/>
-    </tr>
-    <tr>
-      <td align=left tal:content="python: 'Tel: %s' % from_organisation.getDefaultTelephone().asText()" colspan="2"/>
-      <td align=right tal:content="python: 'Delivery Date: %s' % here.getStopDate()"/>
-    </tr>
-    <tr>
-      <td tal:content="python: from_organisation.getDefaultAddress().getStreetAddress()" colspan="2"/>
-      <td align=right tal:content="python: 'Proforma No: ERP5/%s' % here.getId()"/>
-    </tr>
-    <tr>
-      <td tal:content="python: '%s %s' %
-                              (from_organisation.getDefaultAddress().getZipCode(),
-                              from_organisation.getDefaultAddress().getCity())" colspan="3"/>
-    </tr>
-    <tr>
-      <td tal:content="python: from_organisation.getDefaultAddress().getRegionTitle()" colspan="3"/>
-    </tr>
-
-    <tr>
-      <th colspan=3>
-        <h2>PROFORMA</h2>
-      </th>
-    </tr>
-
-    </table>
-
-    <br/>
-
-      <table width=100%>
-      <tr bgcolor=000000>
-        <th align=left><font color=ffffff>PROFORMA ADDRESS</font></th>
-        <th align=left><font color=ffffff>DELIVERY ADDRESS</font></th>
-      </tr>
-
-      <tr>
-        <td align=left tal:content="client_invoice/getCorporateName | client_invoice/getTitle"/>
-        <td align=left tal:content="client_delivery/getCorporateName | client_delivery/getTitle"/>
-      </tr>
-      <tr>
-        <td align=left tal:content="python: client_invoice.getDefaultAddress().getStreetAddress()" tal:on-error="nothing"/>
-        <td align=left tal:content="python: client_delivery.getDefaultAddress().getStreetAddress()" tal:on-error="nothing"/>
-      </tr>
-      <tr>
-        <td align=left>
-          <tal:block tal:replace="python: client_invoice.getDefaultAddress().getZipCode()" tal:on-error="nothing"/>
-          <tal:block tal:replace="python: client_invoice.getDefaultAddress().getCity()" tal:on-error="nothing"/>
-        </td>
-        <td align=left>
-          <tal:block tal:replace="python: client_delivery.getDefaultAddress().getZipCode()" tal:on-error="nothing"/>
-          <tal:block tal:replace="python: client_delivery.getDefaultAddress().getCity()" tal:on-error="nothing"/>
-        </td>
-      </tr>
-      <tr>
-        <td align=left tal:content="python: client_invoice.getDefaultAddress().getRegionTitle()" tal:on-error="nothing"/>
-        <td align=left tal:content="python: client_delivery.getDefaultAddress().getRegionTitle()" tal:on-error="nothing"/>
-      </tr>
-      </table>
-
-    <br/>
-
-      <table width=100%>
-        <tr bgcolor=000000>
-          <th align=left nowrap><font color=ffffff>Number</font></th>
-          <th align=left nowrap><font color=ffffff>Description</font></th>
-          <th nowrap><font color=ffffff>Quantity</th>
-          <th nowrap><font color=ffffff>Unit</font></th>
-          <th nowrap><font color=ffffff>Unit Price</font></th>
-          <th nowrap><font color=ffffff>Total Price</font></th>
-        </tr>
-        <tal:block tal:repeat="line order_line_list">
-          <tr valign=top tal:condition="python:line.getQuantity()>0">
-
-            <td align=left tal:content="python:line.getId()"></td>
-      <!--      <td> </td> -->
-            <td tal:content="python: line.getResourceTitle()"></td>
-            <td align=right tal:content="python: '%.0f' % line.getQuantity()"></td>
-            <td align=right tal:content="python: line.getQuantityUnit()"></td>
-            <td align=right tal:content="python: '%.02f' % line.getPrice()"></td>
-            <td align=right tal:content="python: '%.02f' % line.getTotalPrice()"></td>
-          </tr>
-        </tal:block>
-        <tr>
-          <td colspan=6><hr noshade></td>
-        </tr>
-        <tr>
-          <th colspan=4 align=right>Total
-            (<span tal:replace="here/income/getResourceId | nothing"/>)</th>
-          <td colspan=2 align=right tal:content="python: '%.02f' % round(here.Invoice_zGetTotal()[0].total_price, 2)" tal:on-error="nothing"></td>
-        </tr>
-        <tr>
-          <td colspan=1 align=left tal:content="python:here.getDescription()"></td>
-          <th colspan=3 align=right>VAT <tal:block tal:replace="python: ( 0.0) * 100.0"/> % (<span tal:replace="here/income/getResourceId | nothing"/>)</th>
-          <td colspan=2 align=right tal:content="python: '%.02f' % round(here.Invoice_zGetTotalVat(), 2)" tal:on-error="nothing"></td>
-        </tr>
-        <tr>
-          <td colspan=3>&nbsp;</td>
-          <td colspan=3><hr noshade></td>
-        </tr>
-        <tr>
-          <td colspan=3></td>
-
-          <th colspan=1 align=right nowrap>Amount Paid
-            (<span tal:replace="here/income/getResourceId | nothing"/>)</th>
-          <th colspan=2 align=right tal:content="python: '%.02f' % (round(here.Invoice_zGetTotalVat(), 2) + round(here.Invoice_zGetTotalNetPrice(), 2))" tal:on-error="nothing"></th>
-        </tr>
-        <tr>
-          <td>&nbsp;</td>
-        </tr>
-      </table>
-
-  <table width="100%">
-  <tr>
-        <td><center><h6>RCS Roubaix Tourcoing 440 047 504<br>
-  Banque:&nbsp;30027&nbsp;Guichet:&nbsp;00039&nbsp;Compte:&nbsp;00000013323&nbsp;RIB:&nbsp;36<br>IBAN: FR76 3002 7175 3900 0410 2760 135<br>
-  VAT FR72440047504</h6></center></td>
-    </tr>
-  </table>
-
-
-
-</body>
-
-</html>
diff --git a/product/ERP5/skins/erp5_trade/SalePackingListLine_view.form b/product/ERP5/skins/erp5_trade/SalePackingListLine_view.form
deleted file mode 100755
index d4beb3e96762f70b822b4e69174a761a75158d93..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SalePackingListLine_view.form
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Packing List Line</title>
-  <row_length>4</row_length>
-  <name>SaleOrderModule_viewSaleOrderList</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_target_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <title>Wanted Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_resource_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>resource</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>product</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Service', 'Service'), ('Product', 'Product')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Product or Service</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/SalePackingListModule_viewSalePackingListList.form b/product/ERP5/skins/erp5_trade/SalePackingListModule_viewSalePackingListList.form
deleted file mode 100755
index 42d4fb7deb3efd31c5301c08eb5fe161eeb87f52..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SalePackingListModule_viewSalePackingListList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Packing List</title>
-  <row_length>4</row_length>
-  <name>SalePackingListModule_viewSalePackingListList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('causality_title', 'Sale'), ('default_destination_title', 'Client'), ('target_stop_date', 'Wanted Date'), ('start_date', 'Delivery Date'), ('sale_packing_list_state', 'State')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Sale Packing List', 'Sales Packing List')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>sale_packing_list_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Sale Packing List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/SalePackingList_view.form b/product/ERP5/skins/erp5_trade/SalePackingList_view.form
deleted file mode 100755
index 0f912461ce3306326bab6aeb55e8e15bc11ad8a2..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/SalePackingList_view.form
+++ /dev/null
@@ -1,384 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Sale Packing List</title>
-  <row_length>4</row_length>
-  <name>accounting_transaction_list</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Client</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_causality_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>causality</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>sale_order</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Sale Order', 'Sales Order')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Sale Order</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_target_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Deliver from</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_target_stop_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Deliver before</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_start_date</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>ymd</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Delivery Date</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">4</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">80</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('description', 'Description'), ('resource_title', 'Product'), ('quantity', 'Target Quantity'), ('target_quantity', 'Quantity'), ('price', 'Price')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[('target_quantity', 'Quantity'), ('price', 'Price')]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>Folder_viewContentList</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>sale_packing_list_line_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns></sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Sale Packing List Lines</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      <field><id>listbox_target_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>listbox_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/ServiceModule_viewServiceList.form b/product/ERP5/skins/erp5_trade/ServiceModule_viewServiceList.form
deleted file mode 100755
index 5027cd1c974ce48f437f004f6ddd5c32af4c9fa8..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/ServiceModule_viewServiceList.form
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Service</title>
-  <row_length>4</row_length>
-  <name>ServiceModule_viewServiceList</name>
-  <pt>form_list</pt>
-  <action>Base_doSelect</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">1</Base_viewSearchResultList>
-          <all_columns type="list">[]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('Title', 'Title'), ('Description', 'Description'), ('validation_state', 'Validation')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">30</lines>
-          <list_action>list</list_action>
-          <list_method type="method">portal_catalog</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Service', 'Service')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">1</select>
-          <selection_name>service_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Service List</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/Service_view.form b/product/ERP5/skins/erp5_trade/Service_view.form
deleted file mode 100755
index 1073634516e09d840b2819df9ea142a1f5bc9762..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/Service_view.form
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Product</title>
-  <row_length>4</row_length>
-  <name>Product_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_id</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Id</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_title</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">1</required>
-          <title>Title</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Supplier</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_quantity_unit</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Unit</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/quantity_unit/getCategoryChildItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_description</id> <type>TextAreaField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <height type="int">5</height>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <max_linelength></max_linelength>
-          <max_lines></max_lines>
-          <required type="int">0</required>
-          <title>Description</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-          <width type="int">40</width>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_many_lines">You entered too many lines.</message>
-          <message name="line_too_long">A line was too long.</message>
-          <message name="too_long">You entered too many characters.</message>
-        </messages>
-      </field>
-      <field><id>my_variation_base_category_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[('tax_category', 'tax_category'), ('salary_range', 'salary_range')]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <size type="int">5</size>
-          <title>Variation Base</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_variation_category_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <editable_expression></editable_expression>
-          <editable_permission type="list">[]</editable_permission>
-          <editable_role type="list">[]</editable_role>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <not_viewable type="int">0</not_viewable>
-          <read_only type="int">0</read_only>
-          <required type="int">0</required>
-          <size type="int">5</size>
-          <title>Variation Range</title>
-          <unicode type="int">0</unicode>
-          <view_separator>&lt;br /&gt;</view_separator>
-          <viewable_expression></viewable_expression>
-          <viewable_permission type="list">[]</viewable_permission>
-          <viewable_role type="list">[]</viewable_role>
-        </values>
-        <tales>
-          <items>here/getVariationRangeCategoryItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_base_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Nexedi Price</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_priced_quantity</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Priced Quantity</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <default>here/getPricedQuantity</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_source_base_price</id> <type>FloatField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Supplier price</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
-      <field><id>my_source_base_price_validity</id> <type>DateTimeField</type>
-        <values>
-          <allow_empty_time type="int">0</allow_empty_time>
-          <alternate_name></alternate_name>
-          <ampm_time_style type="int">0</ampm_time_style>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <hidden type="int">0</hidden>
-          <input_order>dmy</input_order>
-          <input_style>text</input_style>
-          <required type="int">0</required>
-          <time_separator>:</time_separator>
-          <title>Price Valid Until</title>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_datetime">You did not enter a valid date and time.</message>
-          <message name="datetime_out_of_range">The date and time you entered were out of range.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/TradeConditionDiscount_view.form b/product/ERP5/skins/erp5_trade/TradeConditionDiscount_view.form
deleted file mode 100755
index 5c60406c6821ba79e392e3f2ab703808d3ffee50..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/TradeConditionDiscount_view.form
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Discounts</title>
-  <row_length>4</row_length>
-  <name>TradeConditionProfile_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[('id', 'Discount'), ('description', 'Description'), ('getDiscountRatio', 'Ratio')]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Discount'), ('description', 'Description'), ('getDiscountRatio', 'Ratio')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('description', "''")]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>list</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Discount', 'Discount')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>discount_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Discounts</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/TradeConditionPayment_view.form b/product/ERP5/skins/erp5_trade/TradeConditionPayment_view.form
deleted file mode 100755
index 4a110f06c993fcd9ce1b82d5884cd8c1ec369d24..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/TradeConditionPayment_view.form
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Payment</title>
-  <row_length>4</row_length>
-  <name>TradeConditionPayment_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_payment_mode</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Payment Mode</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/payment_mode/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_payment_term</id> <type>IntegerField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <end></end>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">1</required>
-          <start></start>
-          <title>Payment Delay (days)</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_integer">You did not enter an integer.</message>
-          <message name="integer_out_of_range">The integer you entered was out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_payment_end_of_month</id> <type>CheckBoxField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="int">0</default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <title>Payment at the end of month</title>
-        </values>
-        <tales>
-          <default>here/getPaymentEndOfMonth</default>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      <field><id>my_payment_additional_term</id> <type>IntegerField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">10</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <end></end>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <start></start>
-          <title>Supplemental Delay (days)</title>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="not_integer">You did not enter an integer.</message>
-          <message name="integer_out_of_range">The integer you entered was out of range.</message>
-        </messages>
-      </field>
-      <field><id>my_trade_date</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">1</required>
-          <size type="int">1</size>
-          <title>Reference Date</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>here/portal_categories/trade_date/getCategoryChildLogicalPathItemList</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      <field><id>listbox</id> <type>ListBox</type>
-        <values>
-          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
-          <all_columns type="list">[('id', 'Payment'), ('description', 'Description')]</all_columns>
-          <all_editable_columns type="list">[]</all_editable_columns>
-          <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Payment'), ('description', 'Description')]</columns>
-          <css_class></css_class>
-          <default></default>
-          <default_params type="list">[('id', "''"), ('description', "''")]</default_params>
-          <description></description>
-          <domain_root_list type="list">[]</domain_root_list>
-          <domain_tree type="int">0</domain_tree>
-          <editable type="int">1</editable>
-          <editable_columns type="list">[]</editable_columns>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <global_attributes type="list">[]</global_attributes>
-          <hidden type="int">0</hidden>
-          <lines type="int">10</lines>
-          <list_action>list</list_action>
-          <list_method type="method">searchFolder</list_method>
-          <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[('Payment Condition', 'Payment Condition')]</portal_types>
-          <report_root_list type="list">[]</report_root_list>
-          <report_tree type="int">0</report_tree>
-          <search></search>
-          <search_columns type="list">[]</search_columns>
-          <select type="int">0</select>
-          <selection_name>payment_condition_selection</selection_name>
-          <sort type="list">[('id', 'id')]</sort>
-          <sort_columns type="list">[]</sort_columns>
-          <stat_columns></stat_columns>
-          <stat_method></stat_method>
-          <title>Supplemental Payments</title>
-          <url_columns></url_columns>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/TradeConditionProfile_view.form b/product/ERP5/skins/erp5_trade/TradeConditionProfile_view.form
deleted file mode 100755
index e17951b4f9d453ac7ce2b9df3fb818ef8920caff..0000000000000000000000000000000000000000
--- a/product/ERP5/skins/erp5_trade/TradeConditionProfile_view.form
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version="1.0"?>
-
-<form>
-  <title>Profile of Trade</title>
-  <row_length>4</row_length>
-  <name>TradeConditionProfile_view</name>
-  <pt>form_view</pt>
-  <action>Base_edit</action>
-  <update_action></update_action>
-  <method>POST</method>
-  <enctype></enctype>
-  <encoding>UTF-8</encoding>
-  <stored_encoding>UTF-8</stored_encoding>
-  <unicode_mode>false</unicode_mode>
-  <groups>
-    <group>
-      <title>left</title>
-      <fields>
-
-      <field><id>my_source_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Category', 'Category'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Delivered by</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_section</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <extra_item></extra_item>
-          <first_item type="int">0</first_item>
-          <hidden type="int">0</hidden>
-          <items type="list">[]</items>
-          <required type="int">0</required>
-          <size type="int">1</size>
-          <title>For the account of</title>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-          <items>python: [['Nexedi', 'organisation/nexedi']]</items>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="unknown_selection">You selected an item that was not in the list.</message>
-        </messages>
-      </field>
-      <field><id>my_source_decision_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_decision</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Category', 'Category'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Ordered for</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_administration_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_administration</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Category', 'Category'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Managed by</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_source_payment_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>source_payment</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Category', 'Category'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Paid for</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>right</title>
-      <fields>
-
-      <field><id>my_destination_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Category', 'Category'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Deliver to</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_section_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_section</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Category', 'Category'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>For the account of</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_decision_organisation_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_decision</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Category', 'Category')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Ordered by</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_administration_organisation_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_administration</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Category', 'Category')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Invoice for</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      <field><id>my_destination_payment_title</id> <type>RelationStringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <base_category>destination_payment</base_category>
-          <catalog_index>Title</catalog_index>
-          <css_class></css_class>
-          <default></default>
-          <default_module>organisation</default_module>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>Base_jumpToRelatedDocument</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation'), ('Category', 'Category'), ('Person', 'Person')]</portal_type>
-          <relation_setter_id></relation_setter_id>
-          <required type="int">0</required>
-          <title>Paid by</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <update_method>Base_updateRelation</update_method>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>center</title>
-      <fields>
-
-      <field><id>my_source_decision_destination_reference</id> <type>StringField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
-          <editable type="int">1</editable>
-          <enabled type="int">1</enabled>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <max_length></max_length>
-          <required type="int">0</required>
-          <title>Provider Code</title>
-          <truncate type="int">0</truncate>
-          <unicode type="int">0</unicode>
-          <whitespace_preserve type="int">0</whitespace_preserve>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message name="required_not_found">Input is required but no input given.</message>
-          <message name="too_long">Too much input was given.</message>
-        </messages>
-      </field>
-      </fields>
-    </group>
-    <group>
-      <title>bottom</title>
-      <fields>
-
-      </fields>
-    </group>
-    <group>
-      <title>hidden</title>
-      <fields>
-
-      </fields>
-    </group>
-  </groups>
-</form>
\ No newline at end of file