From c2f00125660331fe4e9a03de683f94dcb9c36aa0 Mon Sep 17 00:00:00 2001
From: Jean-Paul Smets <jp@nexedi.com>
Date: Mon, 12 Jul 2004 15:54:50 +0000
Subject: [PATCH] updated by yo, jp et al. on real use server

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1165 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5/skins/erp5_crm/mail_received.py  |  55 ++--
 .../ERP5/skins/erp5_crm/organisation_cat.form |  15 +-
 .../skins/erp5_crm/organisation_list.form     |  60 +++-
 .../organisation_listCoordinates.form         |  15 +-
 .../skins/erp5_crm/organisation_view.form     | 155 +++++++--
 .../erp5_crm/organisation_viewDetails.form    | 247 +++++++++++---
 .../ERP5/skins/erp5_crm/person_emails.form    |  27 +-
 .../ERP5/skins/erp5_crm/person_exchange.form  |  26 +-
 product/ERP5/skins/erp5_crm/person_list.form  |  62 ++--
 .../skins/erp5_crm/person_list_phone.form     |  15 +-
 .../skins/erp5_crm/person_list_sort_on.form   |  22 +-
 .../ERP5/skins/erp5_crm/person_list_ui.form   |  58 +---
 .../ERP5/skins/erp5_crm/person_report.form    |  24 +-
 .../ERP5/skins/erp5_crm/person_search.form    |  24 +-
 .../skins/erp5_crm/person_search_phones.form  |  20 +-
 product/ERP5/skins/erp5_crm/person_view.form  | 225 +++++++------
 .../skins/erp5_crm/person_viewProfile.form    | 138 ++++++--
 .../publication_workflow_validate.form        |  20 +-
 product/ERP5/skins/erp5_crm/sale_enquire.form |  20 +-
 product/ERP5/skins/erp5_crm/sale_offer.form   |  20 +-
 .../skins/erp5_crm/sale_opportunity_list.form |  66 ++--
 .../skins/erp5_crm/sale_opportunity_view.form | 141 +++++++-
 product/ERP5/skins/erp5_crm/sale_reset.form   |  20 +-
 .../skins/erp5_trade/Inventory_fastInput.form |  18 +-
 .../erp5_trade/InvoiceLine_priceView.form     |  61 +++-
 .../erp5_trade/InvoiceLine_quantityView.form  |  58 +++-
 .../skins/erp5_trade/InvoiceLine_view.form    | 100 ++++--
 .../ERP5/skins/erp5_trade/contact_view.form   |  20 +-
 product/ERP5/skins/erp5_trade/event_list.form |  46 ++-
 .../erp5_trade/event_workflow_assign.form     |  24 +-
 .../erp5_trade/event_workflow_respond.form    |  30 +-
 .../internal_packing_list_line_list.form      |  15 +-
 .../internal_packing_list_line_view.form      |  30 +-
 .../internal_packing_list_list.form           |  41 ++-
 .../internal_packing_list_view.form           |  76 ++++-
 .../skins/erp5_trade/inventory_line_view.form |  27 +-
 .../ERP5/skins/erp5_trade/inventory_list.form | 304 +++---------------
 .../ERP5/skins/erp5_trade/inventory_view.form |  42 ++-
 .../skins/erp5_trade/mail_message_view.form   | 189 ++++++++---
 .../order_packing_list_line_view.form         |  30 +-
 .../erp5_trade/order_packing_list_list.form   |  15 +-
 .../erp5_trade/order_packing_list_view.form   |  50 ++-
 .../erp5_trade/order_workflow_action.form     |  28 +-
 .../skins/erp5_trade/packing_list_print.pt    |  26 +-
 ...kflow_user_create_invoice_transaction.form |  22 +-
 .../ERP5/skins/erp5_trade/pricing_view.form   |  85 ++++-
 .../ERP5/skins/erp5_trade/product_list.form   |  44 ++-
 .../ERP5/skins/erp5_trade/product_view.form   |  64 +++-
 .../publication_workflow_validate.form        |  20 +-
 ...urchase_invoice_transaction_line_view.form |  29 +-
 .../purchase_invoice_transaction_view.form    |  57 +++-
 .../erp5_trade/purchase_order_line_view.form  |  31 +-
 .../skins/erp5_trade/purchase_order_list.form |  42 ++-
 .../skins/erp5_trade/purchase_order_view.form |  51 ++-
 .../purchase_packing_list_line_view.form      |  30 +-
 .../purchase_packing_list_list.form           |  46 ++-
 .../purchase_packing_list_view.form           |  50 ++-
 .../sale_invoice_transaction_line_view.form   |  29 +-
 .../sale_invoice_transaction_view.form        |  61 +++-
 .../erp5_trade/sale_order_line_view.form      |  59 +++-
 .../skins/erp5_trade/sale_order_list.form     |  42 ++-
 .../skins/erp5_trade/sale_order_view.form     |  57 +++-
 .../sale_packing_list_line_view.form          |  30 +-
 .../erp5_trade/sale_packing_list_list.form    |  44 ++-
 .../erp5_trade/sale_packing_list_view.form    |  89 ++++-
 .../ERP5/skins/erp5_trade/service_list.form   |  42 ++-
 .../ERP5/skins/erp5_trade/service_view.form   | 121 ++++++-
 67 files changed, 2884 insertions(+), 966 deletions(-)

diff --git a/product/ERP5/skins/erp5_crm/mail_received.py b/product/ERP5/skins/erp5_crm/mail_received.py
index 77067a7177..3849e8568e 100755
--- a/product/ERP5/skins/erp5_crm/mail_received.py
+++ b/product/ERP5/skins/erp5_crm/mail_received.py
@@ -12,29 +12,39 @@ import string
 mail_message = None
 
 try:
-
   id = container.strip_punctuation(theMail['headers']['message-id'])
-  context.event.invokeFactory(type_name='Mail Message',
-                          id=id,attachments=theMail['attachments'])
+  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)
 
-  mail_message = context.event.restrictedTraverse(id)
   subject=str(string.join(theMail['headers'].get('subject')))
 
-  #subject = 'toto'
-
-  kw={'title':theMail['headers'].get('subject'),
-      #'subject':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'],
-  #    'attachment':theMail['attachments']
-  }
+  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'],
+                 )
 
-  mail_message.edit(**kw)
+  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:
@@ -54,10 +64,13 @@ try:
       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)
-        mail_message.setSubordinationValue(parent.getSubordinationValue())
-      if parent.getPortalType() == 'Organisation':
-        mail_message.setSubordinationValue(parent)
       break
 
   # We should look if there's already a sale opportunity
diff --git a/product/ERP5/skins/erp5_crm/organisation_cat.form b/product/ERP5/skins/erp5_crm/organisation_cat.form
index 2db5b66871..58bc347925 100755
--- a/product/ERP5/skins/erp5_crm/organisation_cat.form
+++ b/product/ERP5/skins/erp5_crm/organisation_cat.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title></title>
+  <row_length>4</row_length>
   <name>organisation_list</name>
+  <pt>form_list</pt>
   <action></action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_list</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -25,7 +29,9 @@
           <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>
@@ -41,6 +47,7 @@
           <report_tree></report_tree>
           <reverse type="int">0</reverse>
           <search type="int">1</search>
+          <search_columns></search_columns>
           <select></select>
           <selection_name></selection_name>
           <sort></sort>
diff --git a/product/ERP5/skins/erp5_crm/organisation_list.form b/product/ERP5/skins/erp5_crm/organisation_list.form
index 86c38c0b85..0fdd6aa463 100755
--- a/product/ERP5/skins/erp5_crm/organisation_list.form
+++ b/product/ERP5/skins/erp5_crm/organisation_list.form
@@ -1,51 +1,59 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
-  <title></title>
+  <title>Organisation</title>
+  <row_length>4</row_length>
   <name>organisation_list</name>
-  <action></action>
-  <enctype></enctype>
-  <method>POST</method>
   <pt>form_list</pt>
-
+  <action>doSelect</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>
+      <title>left</title>
       <fields>
 
       <field><id>listbox</id> <type>ListBox</type>
         <values>
           <all_columns type="list">[]</all_columns>
-          <all_editable_columns></all_editable_columns>
+          <all_editable_columns type="list">[]</all_editable_columns>
           <alternate_name></alternate_name>
-          <columns type="list">[('id', 'id'), ('Title', 'Title'), ('Description', 'Description')]</columns>
+          <columns type="list">[('id', 'id'), ('Title', 'Title'), ('validation_state', 'State'), ('Description', 'Description')]</columns>
           <css_class></css_class>
           <default></default>
           <default_params type="list">[('min', '(0,1,3)'), ('max', '100')]</default_params>
           <description></description>
-          <domain_root_list></domain_root_list>
-          <domain_tree></domain_tree>
-          <editable_columns></editable_columns>
+          <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></global_attributes>
+          <global_attributes type="list">[]</global_attributes>
           <height type="int">5</height>
           <hidden type="int">0</hidden>
           <lines type="int">25</lines>
-          <list_action>organisation_list</list_action>
+          <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></report_root_list>
-          <report_tree></report_tree>
+          <report_root_list type="list">[]</report_root_list>
+          <report_tree type="int">0</report_tree>
           <reverse type="int">0</reverse>
           <search type="int">1</search>
+          <search_columns type="list">[]</search_columns>
           <select type="int">1</select>
           <selection_name>organisations_selection</selection_name>
           <sort type="list">[]</sort>
+          <sort_columns type="list">[]</sort_columns>
           <stat_method></stat_method>
-          <title>Contacts</title>
+          <title>Organisation List</title>
           <width type="int">40</width>
         </values>
         <tales>
@@ -56,5 +64,23 @@
       </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_listCoordinates.form b/product/ERP5/skins/erp5_crm/organisation_listCoordinates.form
index b251ef1585..6f1a10c99b 100755
--- a/product/ERP5/skins/erp5_crm/organisation_listCoordinates.form
+++ b/product/ERP5/skins/erp5_crm/organisation_listCoordinates.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title></title>
+  <row_length>4</row_length>
   <name>organisation_list</name>
+  <pt>form_list</pt>
   <action></action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_list</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -25,7 +29,9 @@
           <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>
@@ -41,6 +47,7 @@
           <report_tree></report_tree>
           <reverse type="int">0</reverse>
           <search type="int">0</search>
+          <search_columns></search_columns>
           <select type="int">1</select>
           <selection_name></selection_name>
           <sort></sort>
diff --git a/product/ERP5/skins/erp5_crm/organisation_view.form b/product/ERP5/skins/erp5_crm/organisation_view.form
index f90243d1c3..8edf9f4bd0 100755
--- a/product/ERP5/skins/erp5_crm/organisation_view.form
+++ b/product/ERP5/skins/erp5_crm/organisation_view.form
@@ -1,16 +1,20 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Organisation</title>
+  <row_length>4</row_length>
   <name>General</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
-      <title>Left</title>
+      <title>left</title>
       <fields>
 
       <field><id>my_id</id> <type>StringField</type>
@@ -21,13 +25,17 @@
           <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>Identifiant</title>
+          <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>
@@ -46,13 +54,17 @@
           <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>Nom courant</title>
+          <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>
@@ -71,13 +83,17 @@
           <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>Raison sociale</title>
+          <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>
@@ -94,14 +110,19 @@
           <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>Rôle</title>
+          <title>Role</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
           <items>here/portal_categories/role/getFormItemList</items>
@@ -118,14 +139,19 @@
           <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>Groupe</title>
+          <title>Group</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
           <items>here/portal_categories/group/getFormItemList</items>
@@ -142,14 +168,19 @@
           <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>Métier</title>
+          <title>Activity</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
           <items>here/portal_categories/activity/getFormItemList</items>
@@ -166,14 +197,19 @@
           <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>Activité</title>
+          <title>Function</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
           <items>here/portal_categories/function/getFormItemList</items>
@@ -184,10 +220,38 @@
           <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>
+      <title>right</title>
       <fields>
 
       <field><id>my_default_email_text</id> <type>EmailField</type>
@@ -198,6 +262,8 @@
           <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>
@@ -205,6 +271,8 @@
           <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>
@@ -223,13 +291,17 @@
           <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>Téléphone</title>
+          <title>Telephone</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -247,6 +319,8 @@
           <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>
@@ -254,6 +328,8 @@
           <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>
@@ -269,6 +345,8 @@
           <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>
@@ -277,7 +355,9 @@
           <max_linelength></max_linelength>
           <max_lines></max_lines>
           <required type="int">0</required>
-          <title>Adresse</title>
+          <title>Address</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
           <width type="int">30</width>
         </values>
         <tales>
@@ -298,13 +378,17 @@
           <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>Code postal</title>
+          <title>Post Code</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -322,13 +406,17 @@
           <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>Ville</title>
+          <title>City</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -344,14 +432,19 @@
           <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>Pays</title>
+          <title>Country</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
           <items>here/portal_categories/region/getFormItemList</items>
@@ -365,7 +458,7 @@
       </fields>
     </group>
     <group>
-      <title>Middle</title>
+      <title>center</title>
       <fields>
 
       <field><id>my_description</id> <type>TextAreaField</type>
@@ -374,6 +467,8 @@
           <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>
@@ -382,7 +477,9 @@
           <max_linelength></max_linelength>
           <max_lines></max_lines>
           <required type="int">0</required>
-          <title>Commentaires</title>
+          <title>Comments</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
           <width type="int">100</width>
         </values>
         <tales>
@@ -399,22 +496,24 @@
       </fields>
     </group>
     <group>
-      <title>List</title>
+      <title>bottom</title>
       <fields>
 
-      <field><id>coordonnnees_list</id> <type>ListBox</type>
+      <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">[('id', 'Coordonn\xe9e'), ('asText', 'Valeur')]</columns>
+          <columns type="list">[('id', 'Contact'), ('asText', 'Value')]</columns>
           <css_class></css_class>
           <default></default>
-          <default_params type="list">[('id', "''")]</default_params>
+          <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>
@@ -425,16 +524,18 @@
           <list_cookie>CONTACT_LIST</list_cookie>
           <list_method type="method">searchFolder</list_method>
           <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_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 type="int">0</search>
+          <search_columns type="list">[]</search_columns>
           <select type="int">0</select>
-          <selection_name>folder_selection</selection_name>
+          <selection_name>contact_list</selection_name>
           <sort type="list">[]</sort>
+          <sort_columns type="list">[]</sort_columns>
           <stat_method></stat_method>
-          <title>Coordonnées</title>
+          <title>Contacts</title>
           <width type="int">40</width>
         </values>
         <tales>
diff --git a/product/ERP5/skins/erp5_crm/organisation_viewDetails.form b/product/ERP5/skins/erp5_crm/organisation_viewDetails.form
index ec977420ef..6480000c78 100755
--- a/product/ERP5/skins/erp5_crm/organisation_viewDetails.form
+++ b/product/ERP5/skins/erp5_crm/organisation_viewDetails.form
@@ -1,19 +1,81 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Organisation</title>
+  <row_length>4</row_length>
   <name>Details</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <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_apeCode</id> <type>StringField</type>
+      <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/getFormItemList</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>
@@ -21,13 +83,17 @@
           <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>Code APE</title>
+          <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>
@@ -37,7 +103,7 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_ean_code</id> <type>StringField</type>
+      <field><id>my_geographic_incorporate_code</id> <type>StringField</type>
         <values>
           <alternate_name></alternate_name>
           <css_class></css_class>
@@ -45,13 +111,17 @@
           <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>Code EAN</title>
+          <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>
@@ -61,54 +131,63 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_social_form</id> <type>ListField</type>
+      <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>
-          <first_item type="int">0</first_item>
           <hidden type="int">0</hidden>
-          <items type="list">[]</items>
+          <max_length></max_length>
           <required type="int">0</required>
-          <size type="int">1</size>
-          <title>Forme juridique</title>
+          <title>EAN 13 code</title>
+          <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
-          <items>here/portal_categories/social_form/getFormItemList</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>
+          <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_segmentation</id> <type>MultiListField</type>
+      <field><id>my_activity_code</id> <type>StringField</type>
         <values>
           <alternate_name></alternate_name>
           <css_class></css_class>
-          <default type="list">[]</default>
+          <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>
-          <items type="list">[]</items>
+          <max_length></max_length>
           <required type="int">0</required>
-          <size type="int">3</size>
-          <title>Segmentation</title>
+          <title>Activity code</title>
+          <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
-          <items>here/portal_categories/market_segment/getFormItemList</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>
+          <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_siren_nb</id> <type>StringField</type>
+      <field><id>my_vat_code</id> <type>StringField</type>
         <values>
           <alternate_name></alternate_name>
           <css_class></css_class>
@@ -116,13 +195,17 @@
           <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>N° Siren</title>
+          <title>VAT code</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -132,21 +215,45 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_tva_nb</id> <type>StringField</type>
+      </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">30</display_width>
+          <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_jump_relation</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>
           <required type="int">0</required>
-          <title>N° TVA</title>
+          <title>Social organisation</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <update_method>base_update_relation</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>
@@ -156,7 +263,7 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_whoami4u</id> <type>StringField</type>
+      <field><id>my_social_code</id> <type>StringField</type>
         <values>
           <alternate_name></alternate_name>
           <css_class></css_class>
@@ -164,13 +271,17 @@
           <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>Code fournisseur</title>
+          <title>Social code</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -188,11 +299,14 @@
           <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>Capital social</title>
+          <title>Social capital</title>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -202,12 +316,73 @@
           <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_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_segmentation</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>here/portal_categories/market_segment/getFormItemList</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>
diff --git a/product/ERP5/skins/erp5_crm/person_emails.form b/product/ERP5/skins/erp5_crm/person_emails.form
index 9ad8e3e101..aee21b336e 100755
--- a/product/ERP5/skins/erp5_crm/person_emails.form
+++ b/product/ERP5/skins/erp5_crm/person_emails.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>List Emails</title>
+  <row_length>4</row_length>
   <name>person_search</name>
+  <pt>form_dialog</pt>
   <action>person_emails_report</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -19,14 +23,19 @@
           <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/getFormItemList</items>
@@ -43,14 +52,19 @@
           <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/getFormItemList</items>
@@ -67,14 +81,19 @@
           <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/getFormItemList</items>
diff --git a/product/ERP5/skins/erp5_crm/person_exchange.form b/product/ERP5/skins/erp5_crm/person_exchange.form
index 430097924e..06c79a4547 100755
--- a/product/ERP5/skins/erp5_crm/person_exchange.form
+++ b/product/ERP5/skins/erp5_crm/person_exchange.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -69,6 +81,8 @@
           <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>
@@ -94,6 +108,8 @@
           <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>
@@ -101,6 +117,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_crm/person_list.form b/product/ERP5/skins/erp5_crm/person_list.form
index 6c91e1d841..a4acb1399e 100755
--- a/product/ERP5/skins/erp5_crm/person_list.form
+++ b/product/ERP5/skins/erp5_crm/person_list.form
@@ -1,34 +1,40 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
-  <title>Folder Contents</title>
-  <name>folder_contents</name>
-  <action></action>
-  <enctype></enctype>
-  <method>POST</method>
+  <title>Person</title>
+  <row_length>4</row_length>
+  <name>person_list</name>
   <pt>form_list</pt>
-
+  <action>doSelect</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>
+      <title>left</title>
       <fields>
 
       <field><id>listbox</id> <type>ListBox</type>
         <values>
           <all_columns type="list">[('id', 'Id'), ('Title', 'Title'), ('Description', 'Description'), ('getDefaultRegion', 'Region'), ('getDefaultTelephone', 'Phone'), ('getDefaultFax', 'Fax')]</all_columns>
-          <all_editable_columns></all_editable_columns>
+          <all_editable_columns type="list">[]</all_editable_columns>
           <alternate_name></alternate_name>
-          <columns type="list">[('id', 'Id'), ('Title', 'Title'), ('Description', 'Description')]</columns>
+          <columns type="list">[('id', 'Id'), ('Title', 'Title'), ('getSubordinationTitle', 'Organisation'), ('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></domain_root_list>
-          <domain_tree></domain_tree>
-          <editable_columns></editable_columns>
+          <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></global_attributes>
+          <global_attributes type="list">[]</global_attributes>
           <height type="int">5</height>
           <hidden type="int">0</hidden>
           <lines type="int">30</lines>
@@ -38,15 +44,17 @@
           <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></report_root_list>
-          <report_tree></report_tree>
+          <report_root_list type="list">[]</report_root_list>
+          <report_tree type="int">0</report_tree>
           <reverse type="int">0</reverse>
           <search type="int">1</search>
+          <search_columns type="list">[]</search_columns>
           <select type="int">1</select>
-          <selection_name>persons</selection_name>
+          <selection_name>person_selection</selection_name>
           <sort type="list">[]</sort>
+          <sort_columns type="list">[]</sort_columns>
           <stat_method></stat_method>
-          <title>Persons</title>
+          <title>Person List</title>
           <width type="int">40</width>
         </values>
         <tales>
@@ -57,5 +65,23 @@
       </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/person_list_phone.form b/product/ERP5/skins/erp5_crm/person_list_phone.form
index b26305c5ad..c7f630d5d4 100755
--- a/product/ERP5/skins/erp5_crm/person_list_phone.form
+++ b/product/ERP5/skins/erp5_crm/person_list_phone.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Folder Contents</title>
+  <row_length>4</row_length>
   <name>folder_contents</name>
+  <pt>form_list</pt>
   <action></action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_list</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -25,7 +29,9 @@
           <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>
@@ -42,6 +48,7 @@
           <report_tree></report_tree>
           <reverse type="int">0</reverse>
           <search type="int">1</search>
+          <search_columns></search_columns>
           <select type="int">1</select>
           <selection_name>persons</selection_name>
           <sort type="list">[]</sort>
diff --git a/product/ERP5/skins/erp5_crm/person_list_sort_on.form b/product/ERP5/skins/erp5_crm/person_list_sort_on.form
index 8d282c82e1..a2716f4dd7 100755
--- a/product/ERP5/skins/erp5_crm/person_list_sort_on.form
+++ b/product/ERP5/skins/erp5_crm/person_list_sort_on.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Define Sort Order</title>
+  <row_length>4</row_length>
   <name>person_list_sort_on</name>
+  <pt>form_sort</pt>
   <action>base_sort_on</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_sort</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -19,14 +23,19 @@
           <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>
@@ -42,14 +51,19 @@
           <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>
         </tales>
diff --git a/product/ERP5/skins/erp5_crm/person_list_ui.form b/product/ERP5/skins/erp5_crm/person_list_ui.form
index 7f2b2c53d0..7e0557c20c 100755
--- a/product/ERP5/skins/erp5_crm/person_list_ui.form
+++ b/product/ERP5/skins/erp5_crm/person_list_ui.form
@@ -1,64 +1,22 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Set List Settting</title>
+  <row_length>4</row_length>
   <name>person_list_ui</name>
+  <pt>form_list_ui</pt>
   <action>base_list_ui</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_list_ui</pt>
-
+  <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>columns</id> <type>ListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default></default>
-          <description></description>
-          <external_validator></external_validator>
-          <extra></extra>
-          <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>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_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>
-          <external_validator></external_validator>
-          <extra></extra>
-          <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>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_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>
diff --git a/product/ERP5/skins/erp5_crm/person_report.form b/product/ERP5/skins/erp5_crm/person_report.form
index 9b3e5230e8..f547814f88 100755
--- a/product/ERP5/skins/erp5_crm/person_report.form
+++ b/product/ERP5/skins/erp5_crm/person_report.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title></title>
+  <row_length>4</row_length>
   <name>person_search</name>
+  <pt>form_dialog</pt>
   <action>base_search</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -75,6 +87,8 @@
           <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>
@@ -82,6 +96,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_crm/person_search.form b/product/ERP5/skins/erp5_crm/person_search.form
index f288e5ba1c..712358c25f 100755
--- a/product/ERP5/skins/erp5_crm/person_search.form
+++ b/product/ERP5/skins/erp5_crm/person_search.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Search</title>
+  <row_length>4</row_length>
   <name>search</name>
+  <pt>form_dialog</pt>
   <action>person_list</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -75,6 +87,8 @@
           <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>
@@ -82,6 +96,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_crm/person_search_phones.form b/product/ERP5/skins/erp5_crm/person_search_phones.form
index 4563f765f1..2145e51941 100755
--- a/product/ERP5/skins/erp5_crm/person_search_phones.form
+++ b/product/ERP5/skins/erp5_crm/person_search_phones.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Search</title>
+  <row_length>4</row_length>
   <name>search</name>
+  <pt>form_dialog</pt>
   <action>person_list_phone</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_crm/person_view.form b/product/ERP5/skins/erp5_crm/person_view.form
index fc5fb67f47..4a1d9b13c2 100755
--- a/product/ERP5/skins/erp5_crm/person_view.form
+++ b/product/ERP5/skins/erp5_crm/person_view.form
@@ -1,16 +1,20 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
-  <title>Personne</title>
+  <title>Person</title>
+  <row_length>4</row_length>
   <name>General</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
-      <title>Left</title>
+      <title>left</title>
       <fields>
 
       <field><id>my_id</id> <type>StringField</type>
@@ -21,13 +25,17 @@
           <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>Identifiant</title>
+          <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>
@@ -38,30 +46,6 @@
           <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>
-          <external_validator></external_validator>
-          <extra></extra>
-          <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>Genre</title>
-        </values>
-        <tales>
-          <items>here/portal_categories/gender/getFormItemList</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_first_name</id> <type>StringField</type>
         <values>
           <alternate_name></alternate_name>
@@ -70,16 +54,19 @@
           <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>Prénom</title>
+          <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>
@@ -95,16 +82,19 @@
           <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>Nom</title>
+          <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>
@@ -112,24 +102,28 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_role</id> <type>ListField</type>
+      <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>Rôle</title>
+          <title>Gender</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
-          <default>here/getDefaultRole</default>
-          <items>here/portal_categories/role/getFormItemList</items>
+          <items>here/portal_categories/gender/getFormItemList</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -137,24 +131,28 @@
           <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>
+      <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>Groupe</title>
+          <title>Nationality</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
-          <default>here/getDefaultGroup</default>
-          <items>here/portal_categories/group/getFormItemList</items>
+          <items>here/portal_categories/nationality/getFormItemList</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -162,82 +160,60 @@
           <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>
+      <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>
-          <external_validator></external_validator>
-          <extra></extra>
-          <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>Activité</title>
-        </values>
-        <tales>
-          <default>here/getDefaultActivity</default>
-          <items>here/portal_categories/activity/getFormItemList</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_list</id> <type>MultiListField</type>
-        <values>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <default type="list">[]</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>
-          <items type="list">[]</items>
+          <jump_method>base_jump_relation</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>
-          <size type="int">5</size>
-          <title>Fonctions</title>
+          <title>Current organisation</title>
+          <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
-          <default>here/getSkillList</default>
-          <items>here/portal_categories/skill/getFormItemList</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>
+          <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      </fields>
-    </group>
-    <group>
-      <title>Right</title>
-      <fields>
-
-      <field><id>my_organisation_title</id> <type>RelationStringField</type>
+      <field><id>my_validation_state</id> <type>StringField</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">0</editable>
+          <enabled type="int">1</enabled>
           <external_validator></external_validator>
           <extra></extra>
           <hidden type="int">0</hidden>
-          <jump_method>base_jump_relation</jump_method>
           <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
           <required type="int">0</required>
-          <title>Organisation</title>
+          <title>Validation State</title>
           <truncate type="int">0</truncate>
-          <update_method>base_update_relation</update_method>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -247,6 +223,12 @@
           <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>
@@ -255,6 +237,8 @@
           <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>
@@ -262,6 +246,8 @@
           <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>
@@ -281,13 +267,17 @@
           <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>Téléphone</title>
+          <title>Telephone</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -305,6 +295,8 @@
           <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>
@@ -312,6 +304,8 @@
           <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>
@@ -327,6 +321,8 @@
           <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>
@@ -335,7 +331,9 @@
           <max_linelength></max_linelength>
           <max_lines></max_lines>
           <required type="int">0</required>
-          <title>Adresse</title>
+          <title>Address</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
           <width type="int">30</width>
         </values>
         <tales>
@@ -356,13 +354,17 @@
           <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>Code postal</title>
+          <title>Post Code</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -380,13 +382,17 @@
           <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>Ville</title>
+          <title>City</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -402,14 +408,19 @@
           <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>Pays</title>
+          <title>Country</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
           <items>here/portal_categories/region/getFormItemList</items>
@@ -423,7 +434,7 @@
       </fields>
     </group>
     <group>
-      <title>Middle</title>
+      <title>center</title>
       <fields>
 
       <field><id>my_description</id> <type>TextAreaField</type>
@@ -432,6 +443,8 @@
           <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>
@@ -440,7 +453,9 @@
           <max_linelength></max_linelength>
           <max_lines></max_lines>
           <required type="int">0</required>
-          <title>Commentaires</title>
+          <title>Comments</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
           <width type="int">100</width>
         </values>
         <tales>
@@ -457,22 +472,24 @@
       </fields>
     </group>
     <group>
-      <title>List</title>
+      <title>bottom</title>
       <fields>
 
-      <field><id>coordonnnees_list</id> <type>ListBox</type>
+      <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">[('id', 'Coordonn\xe9e'), ('asText', 'Valeur')]</columns>
+          <columns type="list">[('id', 'Contact'), ('asText', 'Value')]</columns>
           <css_class></css_class>
           <default></default>
-          <default_params type="list">[('id', "''")]</default_params>
+          <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>
@@ -483,16 +500,18 @@
           <list_cookie>CONTACT_LIST</list_cookie>
           <list_method type="method">searchFolder</list_method>
           <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_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 type="int">0</search>
+          <search_columns type="list">[]</search_columns>
           <select type="int">0</select>
-          <selection_name>folder_selection</selection_name>
+          <selection_name>contact_list</selection_name>
           <sort type="list">[]</sort>
+          <sort_columns type="list">[]</sort_columns>
           <stat_method></stat_method>
-          <title>Coordonnées</title>
+          <title>Contacts</title>
           <width type="int">40</width>
         </values>
         <tales>
diff --git a/product/ERP5/skins/erp5_crm/person_viewProfile.form b/product/ERP5/skins/erp5_crm/person_viewProfile.form
index af469d4989..078c682c2b 100755
--- a/product/ERP5/skins/erp5_crm/person_viewProfile.form
+++ b/product/ERP5/skins/erp5_crm/person_viewProfile.form
@@ -1,19 +1,23 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Person Default View Form</title>
+  <row_length>4</row_length>
   <name>General</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <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_id</id> <type>StringField</type>
+      <field><id>my_title</id> <type>StringField</type>
         <values>
           <alternate_name></alternate_name>
           <css_class></css_class>
@@ -21,16 +25,19 @@
           <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>
+          <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>
-          <default>here/id</default>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -38,7 +45,7 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_title</id> <type>StringField</type>
+      <field><id>my_default_career_title</id> <type>StringField</type>
         <values>
           <alternate_name></alternate_name>
           <css_class></css_class>
@@ -46,13 +53,17 @@
           <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>
+          <title>Career title</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -62,24 +73,28 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_group</id> <type>ListField</type>
+      <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>Group</title>
+          <title>Current grade</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
-          <default>here/getDefaultGroup</default>
-          <items>here/portal_categories/group/getFormItemList</items>
+          <items>here/portal_categories/grade/getFormItemList</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -87,24 +102,28 @@
           <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>
+      <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">[('Distribution', 'Distribution'), ('Manufacture', 'Manufacture'), ('Transport', 'Transport')]</items>
+          <items type="list">[]</items>
           <required type="int">0</required>
           <size type="int">1</size>
-          <title>Activity</title>
+          <title>Function</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
-          <default>here/getDefaultActivity</default>
-          <items>here/portal_categories/activity/getFormItemList</items>
+          <items>here/portal_categories/function/getFormItemList</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -112,24 +131,28 @@
           <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>
+      <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">[('Registered office', 'Registered office'), ('Store', 'Store'), ('Wharehouse', 'Wharehouse'), ('Workshop', 'Workshop')]</items>
+          <items type="list">[]</items>
           <required type="int">0</required>
           <size type="int">1</size>
-          <title>Function</title>
+          <title>Current role</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
-          <default>here/getDefaultFunction</default>
-          <items>here/portal_categories/function/getFormItemList</items>
+          <items>here/portal_categories/role/getFormItemList</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -137,24 +160,57 @@
           <message name="unknown_selection">You selected an item that was not in the list.</message>
         </messages>
       </field>
-      <field><id>my_role</id> <type>ListField</type>
+      <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>Role</title>
+          <title>Activity</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
-          <default>here/getDefaultRole</default>
-          <items>here/portal_categories/role/getFormItemList</items>
+          <items>here/portal_categories/activity/getFormItemList</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/getFormItemList</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -168,22 +224,26 @@
       <title>Right</title>
       <fields>
 
-      <field><id>my_product_line_list</id> <type>MultiListField</type>
+      <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">3</size>
+          <size type="int">6</size>
           <title>Product Interest</title>
+          <unicode type="int">0</unicode>
+          <view_separator>&lt;br /&gt;</view_separator>
         </values>
         <tales>
-          <default>here/getProductLineList</default>
           <items>here/portal_categories/product_line/getFormItemList</items>
         </tales>
         <messages>
@@ -192,22 +252,26 @@
           <message name="unknown_selection">You selected an item that was not in the list.</message>
         </messages>
       </field>
-      <field><id>my_skill_list</id> <type>MultiListField</type>
+      <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>Skills</title>
+          <size type="int">6</size>
+          <title>Current 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/getFormItemList</items>
         </tales>
         <messages>
@@ -228,6 +292,8 @@
           <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>
@@ -237,6 +303,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_crm/publication_workflow_validate.form b/product/ERP5/skins/erp5_crm/publication_workflow_validate.form
index 62cf3d0bee..aa4463f8b4 100755
--- a/product/ERP5/skins/erp5_crm/publication_workflow_validate.form
+++ b/product/ERP5/skins/erp5_crm/publication_workflow_validate.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Offer Sale</title>
+  <row_length>4</row_length>
   <name>sale_offer</name>
+  <pt>form_view_dialog</pt>
   <action>workflow_status_modify</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -19,6 +23,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -48,6 +56,8 @@
           <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>
@@ -55,6 +65,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_crm/sale_enquire.form b/product/ERP5/skins/erp5_crm/sale_enquire.form
index 1f6a42ff60..654e393556 100755
--- a/product/ERP5/skins/erp5_crm/sale_enquire.form
+++ b/product/ERP5/skins/erp5_crm/sale_enquire.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Offer Sale</title>
+  <row_length>4</row_length>
   <name>sale_enquire</name>
+  <pt>form_view_dialog</pt>
   <action>workflow_status_modify</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -19,6 +23,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -48,6 +56,8 @@
           <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>
@@ -55,6 +65,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_crm/sale_offer.form b/product/ERP5/skins/erp5_crm/sale_offer.form
index 62cf3d0bee..aa4463f8b4 100755
--- a/product/ERP5/skins/erp5_crm/sale_offer.form
+++ b/product/ERP5/skins/erp5_crm/sale_offer.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Offer Sale</title>
+  <row_length>4</row_length>
   <name>sale_offer</name>
+  <pt>form_view_dialog</pt>
   <action>workflow_status_modify</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -19,6 +23,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -48,6 +56,8 @@
           <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>
@@ -55,6 +65,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_crm/sale_opportunity_list.form b/product/ERP5/skins/erp5_crm/sale_opportunity_list.form
index 0cc8349b8d..26580235ed 100755
--- a/product/ERP5/skins/erp5_crm/sale_opportunity_list.form
+++ b/product/ERP5/skins/erp5_crm/sale_opportunity_list.form
@@ -1,34 +1,40 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
-  <title>Folder Contents</title>
-  <name>folder_contents</name>
-  <action></action>
-  <enctype></enctype>
-  <method>POST</method>
+  <title>Sale Opportunity</title>
+  <row_length>4</row_length>
+  <name>sale_opportunity_list</name>
   <pt>form_list</pt>
-
+  <action>doSelect</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>
+      <title>left</title>
       <fields>
 
-      <field><id>contact_list</id> <type>ListBox</type>
+      <field><id>listbox</id> <type>ListBox</type>
         <values>
-          <all_columns type="list">[('Description', 'Description')]</all_columns>
-          <all_editable_columns></all_editable_columns>
+          <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'), ('sale_state', 'State'), ('Description', 'Description')]</columns>
+          <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></domain_root_list>
-          <domain_tree></domain_tree>
-          <editable_columns></editable_columns>
+          <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></global_attributes>
+          <global_attributes type="list">[]</global_attributes>
           <height type="int">5</height>
           <hidden type="int">0</hidden>
           <lines type="int">30</lines>
@@ -37,15 +43,17 @@
           <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></report_root_list>
-          <report_tree></report_tree>
+          <report_root_list type="list">[]</report_root_list>
+          <report_tree type="int">0</report_tree>
           <reverse type="int">0</reverse>
           <search type="int">1</search>
+          <search_columns type="list">[]</search_columns>
           <select type="int">1</select>
-          <selection_name>sale_opportunities</selection_name>
+          <selection_name>sale_opportunity_selection</selection_name>
           <sort type="list">[]</sort>
+          <sort_columns type="list">[]</sort_columns>
           <stat_method></stat_method>
-          <title>Contacts</title>
+          <title>Sale Opportunity List</title>
           <width type="int">40</width>
         </values>
         <tales>
@@ -56,5 +64,23 @@
       </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/sale_opportunity_view.form b/product/ERP5/skins/erp5_crm/sale_opportunity_view.form
index 56daf4ac01..dbf8c61904 100755
--- a/product/ERP5/skins/erp5_crm/sale_opportunity_view.form
+++ b/product/ERP5/skins/erp5_crm/sale_opportunity_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
-  <title>Person Default View Form</title>
+  <title>Sale Opportunity</title>
+  <row_length>4</row_length>
   <name>General</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -46,6 +54,8 @@
           <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>
@@ -53,6 +63,8 @@
           <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>
@@ -63,6 +75,84 @@
           <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>my_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>Opportunity 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>
@@ -78,6 +168,8 @@
           <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>
@@ -89,7 +181,11 @@
           <portal_type type="list">[('Person', 'Person')]</portal_type>
           <required type="int">0</required>
           <title>Client persons</title>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <view_separator>&lt;br /&gt;
+</view_separator>
+          <whitespace_preserve type="int">0</whitespace_preserve>
           <width type="int">40</width>
         </values>
         <tales>
@@ -112,6 +208,8 @@
           <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>
@@ -123,7 +221,11 @@
           <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
           <required type="int">0</required>
           <title>Client organisations</title>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <view_separator>&lt;br /&gt;
+</view_separator>
+          <whitespace_preserve type="int">0</whitespace_preserve>
           <width type="int">40</width>
         </values>
         <tales>
@@ -149,6 +251,8 @@
           <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>
@@ -158,6 +262,8 @@
           <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>
@@ -174,39 +280,42 @@
       </fields>
     </group>
     <group>
-      <title>List</title>
+      <title>bottom</title>
       <fields>
 
-      <field><id>item_list</id> <type>ListBox</type>
+      <field><id>listbox</id> <type>ListBox</type>
         <values>
           <all_columns type="list">[('id', 'id'), ('portal_type', 'Type'), ('Title', 'Title')]</all_columns>
-          <all_editable_columns></all_editable_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></domain_root_list>
-          <domain_tree></domain_tree>
-          <editable_columns></editable_columns>
+          <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></global_attributes>
+          <global_attributes type="list">[]</global_attributes>
           <height type="int">5</height>
           <hidden type="int">0</hidden>
           <lines type="int">10</lines>
           <list_action>folder_contents</list_action>
           <list_cookie>CONTACT_LIST</list_cookie>
-          <list_method type="method">searchFolder</list_method>
+          <list_method type="method">getFollowUpRelatedValueList</list_method>
           <meta_types type="list">[]</meta_types>
           <portal_types type="list">[]</portal_types>
-          <report_root_list></report_root_list>
-          <report_tree></report_tree>
+          <report_root_list type="list">[]</report_root_list>
+          <report_tree type="int">0</report_tree>
           <reverse type="int">0</reverse>
           <search type="int">0</search>
+          <search_columns></search_columns>
           <select type="int">0</select>
-          <selection_name></selection_name>
+          <selection_name>contact_list_selection</selection_name>
           <sort type="list">[]</sort>
           <stat_method></stat_method>
           <title>Contacts</title>
diff --git a/product/ERP5/skins/erp5_crm/sale_reset.form b/product/ERP5/skins/erp5_crm/sale_reset.form
index a801839c5d..83a2af0a90 100755
--- a/product/ERP5/skins/erp5_crm/sale_reset.form
+++ b/product/ERP5/skins/erp5_crm/sale_reset.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Offer Sale</title>
+  <row_length>4</row_length>
   <name>sale_reset</name>
+  <pt>form_view_dialog</pt>
   <action>workflow_status_modify</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -19,6 +23,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -48,6 +56,8 @@
           <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>
@@ -55,6 +65,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/Inventory_fastInput.form b/product/ERP5/skins/erp5_trade/Inventory_fastInput.form
index d051cf1e72..144c7013cd 100755
--- a/product/ERP5/skins/erp5_trade/Inventory_fastInput.form
+++ b/product/ERP5/skins/erp5_trade/Inventory_fastInput.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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_fastAddLine</action>
-  <enctype>multipart/form-data</enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_dialog</pt>
-
+  <enctype>multipart/form-data</enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -19,6 +23,8 @@
           <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>
@@ -28,6 +34,10 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/InvoiceLine_priceView.form b/product/ERP5/skins/erp5_trade/InvoiceLine_priceView.form
index 3b0ff782a8..9d790db53a 100755
--- a/product/ERP5/skins/erp5_trade/InvoiceLine_priceView.form
+++ b/product/ERP5/skins/erp5_trade/InvoiceLine_priceView.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
-  <title>Ligne de livraison</title>
-  <name>packing_list_line_quantity_view</name>
+  <title>Price of Invoice Line</title>
+  <row_length>4</row_length>
+  <name>InvoiceLine_priceView</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype>multipart/form-data</enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype>multipart/form-data</enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -21,13 +25,17 @@
           <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>Ligne n°</title>
+          <title>Line Number</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -65,7 +73,9 @@
           <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>
@@ -91,6 +101,8 @@
           <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>
@@ -100,6 +112,10 @@
           <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>
@@ -121,6 +137,8 @@
           <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>
@@ -128,6 +146,8 @@
           <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>
@@ -143,6 +163,8 @@
           <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>
@@ -152,6 +174,10 @@
           <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>
@@ -176,6 +202,8 @@
           <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>
@@ -185,6 +213,10 @@
           <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>
@@ -204,6 +236,8 @@
           <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>
@@ -213,6 +247,10 @@
           <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>
@@ -234,11 +272,14 @@
           <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>
@@ -257,11 +298,14 @@
           <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>
@@ -280,11 +324,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/InvoiceLine_quantityView.form b/product/ERP5/skins/erp5_trade/InvoiceLine_quantityView.form
index 8b911fd2fa..acfbcdd7d8 100755
--- a/product/ERP5/skins/erp5_trade/InvoiceLine_quantityView.form
+++ b/product/ERP5/skins/erp5_trade/InvoiceLine_quantityView.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
-  <title>Ligne de livraison</title>
-  <name>packing_list_line_quantity_view</name>
+  <title>Quantity of Invoice Line</title>
+  <row_length>4</row_length>
+  <name>InvoiceLine_quantityView</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype>multipart/form-data</enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype>multipart/form-data</enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -21,13 +25,17 @@
           <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>Ligne n°</title>
+          <title>Line Number</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -65,7 +73,9 @@
           <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>
@@ -91,6 +101,8 @@
           <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>
@@ -100,6 +112,10 @@
           <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>
@@ -121,6 +137,8 @@
           <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>
@@ -128,6 +146,8 @@
           <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>
@@ -143,6 +163,8 @@
           <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>
@@ -152,6 +174,10 @@
           <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>
@@ -176,6 +202,8 @@
           <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>
@@ -185,6 +213,10 @@
           <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>
@@ -204,6 +236,8 @@
           <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>
@@ -213,6 +247,10 @@
           <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>
@@ -234,11 +272,14 @@
           <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>
@@ -257,11 +298,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/InvoiceLine_view.form b/product/ERP5/skins/erp5_trade/InvoiceLine_view.form
index 8e5d735898..9004321ea9 100755
--- a/product/ERP5/skins/erp5_trade/InvoiceLine_view.form
+++ b/product/ERP5/skins/erp5_trade/InvoiceLine_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
-  <title>Ligne de livraison</title>
-  <name>sales_packing_list_line_view</name>
+  <title>Invoice Line</title>
+  <row_length>4</row_length>
+  <name>InvoiceLine_view</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype>multipart/form-data</enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype>multipart/form-data</enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,13 +25,17 @@
           <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>Ligne n°</title>
+          <title>Line Number</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -43,6 +51,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -64,27 +76,31 @@
           <message name="too_long">You entered too many characters.</message>
         </messages>
       </field>
-      <field><id>my_resource_relative_url</id> <type>RelationStringField</type>
+      <field><id>my_resource_title</id> <type>RelationStringField</type>
         <values>
           <alternate_name></alternate_name>
           <base_category>resource</base_category>
-          <catalog_index>relative_url</catalog_index>
+          <catalog_index>Title</catalog_index>
           <css_class></css_class>
           <default></default>
-          <default_module>modele</default_module>
+          <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_jump_relation</jump_method>
           <max_length></max_length>
-          <portal_type type="list">[('Composant', 'Composant'), ('Tissu', 'Tissu'), ('Modele', 'Modele'), ('Forme', 'Forme'), ('Vetement', 'Vetement'), ('Category', 'Category'), ('Gamme', 'Gamme')]</portal_type>
+          <portal_type type="list">[('Product', 'Product'), ('Service', 'Service'), ('Category', 'Category')]</portal_type>
           <required type="int">0</required>
-          <title>Produit</title>
+          <title>Product</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -100,13 +116,18 @@
           <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>Axes variation</title>
+          <title>Variation Axes</title>
+          <unicode type="int">0</unicode>
+          <view_separator>&lt;br /&gt;</view_separator>
         </values>
         <tales>
           <items>here/getVariationRangeBaseCategoryList</items>
@@ -123,13 +144,18 @@
           <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>Variantes</title>
+          <title>Variations</title>
+          <unicode type="int">0</unicode>
+          <view_separator>&lt;br /&gt;</view_separator>
         </values>
         <tales>
           <items>here/getVariationRangeCategoryItemList</items>
@@ -148,11 +174,14 @@
           <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>Quantité par défaut</title>
+          <title>Quantity by default</title>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -174,14 +203,19 @@
           <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>
+          <title>Unit</title>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
           <items>here/getQuantityUnitRangeItemList</items>
@@ -200,11 +234,14 @@
           <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 par défaut</title>
+          <title>Price by default</title>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -222,13 +259,17 @@
           <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>
+          <title> </title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -246,14 +287,17 @@
           <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">1</hidden>
+          <hidden type="int">0</hidden>
           <required type="int">0</required>
-          <title>Quantité facturée</title>
+          <title>Invoiced Quantity</title>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
-          <title>python:'Quantité facturée : %.2f' % here.getTotalQuantity()</title>
+          <default>python: '%.2f' % here.getTotalQuantity()</default>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -269,11 +313,14 @@
           <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 de TVA</title>
+          <title>VAT Ratio</title>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -289,14 +336,19 @@
           <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">[('Non', '0'), ('Oui', '1')]</items>
+          <items type="list">[('No', '0'), ('Yes', '1')]</items>
           <required type="int">0</required>
           <size type="int">1</size>
-          <title>Soumis à la TVA</title>
+          <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>
diff --git a/product/ERP5/skins/erp5_trade/contact_view.form b/product/ERP5/skins/erp5_trade/contact_view.form
index f06be2f72c..474cbc9efe 100755
--- a/product/ERP5/skins/erp5_trade/contact_view.form
+++ b/product/ERP5/skins/erp5_trade/contact_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Contact</title>
+  <row_length>4</row_length>
   <name>list</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -24,6 +28,8 @@
           <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>
@@ -33,7 +39,9 @@
           <required type="int">0</required>
           <title>Event</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -49,6 +57,8 @@
           <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>
@@ -58,6 +68,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/event_list.form b/product/ERP5/skins/erp5_trade/event_list.form
index ddb8ee7c93..86d18f2566 100755
--- a/product/ERP5/skins/erp5_trade/event_list.form
+++ b/product/ERP5/skins/erp5_trade/event_list.form
@@ -1,16 +1,20 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Event</title>
-  <name>folder_contents</name>
-  <action></action>
-  <enctype></enctype>
-  <method>POST</method>
+  <row_length>4</row_length>
+  <name>event_list</name>
   <pt>form_list</pt>
-
+  <action>doSelect</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>
+      <title>left</title>
       <fields>
 
       <field><id>listbox</id> <type>ListBox</type>
@@ -18,14 +22,16 @@
           <all_columns type="list">[]</all_columns>
           <all_editable_columns type="list">[]</all_editable_columns>
           <alternate_name></alternate_name>
-          <columns type="list">[('portal_type', 'Type'), ('title', 'Title'), ('date', 'Date'), ('event_state', 'State')]</columns>
+          <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_columns type="list">[]</editable_columns>
+          <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>
@@ -33,13 +39,15 @@
           <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')]</portal_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 type="int">1</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_method></stat_method>
           <title>Event List</title>
         </values>
@@ -51,5 +59,23 @@
       </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/event_workflow_assign.form b/product/ERP5/skins/erp5_trade/event_workflow_assign.form
index e1f22a4343..fdc637a0f8 100755
--- a/product/ERP5/skins/erp5_trade/event_workflow_assign.form
+++ b/product/ERP5/skins/erp5_trade/event_workflow_assign.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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_status_modify</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -19,6 +23,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -51,6 +59,8 @@
           <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>
@@ -60,7 +70,9 @@
           <required type="int">0</required>
           <title>my_default_follow_up</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -84,6 +96,8 @@
           <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>
@@ -91,6 +105,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/event_workflow_respond.form b/product/ERP5/skins/erp5_trade/event_workflow_respond.form
index b8c520c6dd..cfd03dc13e 100755
--- a/product/ERP5/skins/erp5_trade/event_workflow_respond.form
+++ b/product/ERP5/skins/erp5_trade/event_workflow_respond.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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_status_modify</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -67,6 +79,8 @@
           <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>
@@ -76,7 +90,9 @@
           <max_lines></max_lines>
           <required type="int">1</required>
           <title>Message</title>
-          <width type="int">75</width>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
+          <width type="int">90</width>
         </values>
         <tales>
         </tales>
@@ -102,6 +118,8 @@
           <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>
@@ -109,6 +127,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/internal_packing_list_line_list.form b/product/ERP5/skins/erp5_trade/internal_packing_list_line_list.form
index f1c806ff8a..31b01f48cd 100755
--- a/product/ERP5/skins/erp5_trade/internal_packing_list_line_list.form
+++ b/product/ERP5/skins/erp5_trade/internal_packing_list_line_list.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_list</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -25,7 +29,9 @@
           <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>
@@ -37,6 +43,7 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">1</search>
+          <search_columns></search_columns>
           <select type="int">1</select>
           <selection_name>internal_packing_list_selection</selection_name>
           <sort type="list">[('id', 'id')]</sort>
diff --git a/product/ERP5/skins/erp5_trade/internal_packing_list_line_view.form b/product/ERP5/skins/erp5_trade/internal_packing_list_line_view.form
index 213ad319e4..f6ca65101e 100755
--- a/product/ERP5/skins/erp5_trade/internal_packing_list_line_view.form
+++ b/product/ERP5/skins/erp5_trade/internal_packing_list_line_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -48,6 +56,8 @@
           <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>
@@ -57,7 +67,9 @@
           <required type="int">0</required>
           <title>Product</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -73,6 +85,8 @@
           <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>
@@ -82,6 +96,8 @@
           <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>
@@ -102,11 +118,14 @@
           <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>
@@ -124,11 +143,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/internal_packing_list_list.form b/product/ERP5/skins/erp5_trade/internal_packing_list_list.form
index 210ff28d6c..c5f07d84cc 100755
--- a/product/ERP5/skins/erp5_trade/internal_packing_list_list.form
+++ b/product/ERP5/skins/erp5_trade/internal_packing_list_list.form
@@ -1,19 +1,23 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Internal Packing List</title>
-  <name>accounting_transaction_list</name>
-  <action></action>
-  <enctype></enctype>
-  <method>POST</method>
+  <row_length>4</row_length>
+  <name>internal_packing_list_list</name>
   <pt>form_list</pt>
-
+  <action>doSelect</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>
+      <title>left</title>
       <fields>
 
-      <field><id>order_packing_list_list</id> <type>ListBox</type>
+      <field><id>listbox</id> <type>ListBox</type>
         <values>
           <all_columns type="list">[]</all_columns>
           <all_editable_columns type="list">[]</all_editable_columns>
@@ -25,7 +29,9 @@
           <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>
@@ -37,6 +43,7 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">1</search>
+          <search_columns></search_columns>
           <select type="int">1</select>
           <selection_name>internal_packing_list_selection</selection_name>
           <sort type="list">[('id', 'id')]</sort>
@@ -51,5 +58,23 @@
       </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/internal_packing_list_view.form b/product/ERP5/skins/erp5_trade/internal_packing_list_view.form
index 8f86058ca4..d3a11e579b 100755
--- a/product/ERP5/skins/erp5_trade/internal_packing_list_view.form
+++ b/product/ERP5/skins/erp5_trade/internal_packing_list_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Internal Packing List</title>
+  <row_length>4</row_length>
   <name>purchase_packing_list_view</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -72,6 +84,8 @@
           <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>
@@ -81,7 +95,9 @@
           <required type="int">0</required>
           <title>Order</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -102,6 +118,8 @@
           <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>
@@ -111,7 +129,9 @@
           <required type="int">0</required>
           <title>Source Address</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -132,6 +152,8 @@
           <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>
@@ -141,7 +163,9 @@
           <required type="int">0</required>
           <title>Source Owner</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -159,17 +183,21 @@
 
       <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">1</required>
+          <required type="int">0</required>
           <time_separator>:</time_separator>
           <title>Shipped</title>
         </values>
@@ -184,17 +212,21 @@
       </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_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>
+          <required type="int">0</required>
           <time_separator>:</time_separator>
           <title>Delivered</title>
         </values>
@@ -209,17 +241,21 @@
       </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>
+          <required type="int">0</required>
           <time_separator>:</time_separator>
           <title>Deliver from</title>
         </values>
@@ -234,17 +270,21 @@
       </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>
+          <required type="int">0</required>
           <time_separator>:</time_separator>
           <title>Deliver before</title>
         </values>
@@ -268,6 +308,8 @@
           <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>
@@ -277,7 +319,9 @@
           <required type="int">0</required>
           <title>Destination Address</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -298,6 +342,8 @@
           <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>
@@ -307,7 +353,9 @@
           <required type="int">0</required>
           <title>Destination Owner</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -329,6 +377,8 @@
           <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>
@@ -338,6 +388,8 @@
           <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>
@@ -368,7 +420,9 @@
           <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>
@@ -380,6 +434,7 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">0</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>
@@ -406,11 +461,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/inventory_line_view.form b/product/ERP5/skins/erp5_trade/inventory_line_view.form
index 014006d4ff..552657bb78 100755
--- a/product/ERP5/skins/erp5_trade/inventory_line_view.form
+++ b/product/ERP5/skins/erp5_trade/inventory_line_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -48,6 +56,8 @@
           <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>
@@ -57,7 +67,9 @@
           <required type="int">0</required>
           <title>Product</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -73,6 +85,8 @@
           <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>
@@ -82,6 +96,8 @@
           <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>
@@ -102,11 +118,14 @@
           <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>Inventory</title>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
diff --git a/product/ERP5/skins/erp5_trade/inventory_list.form b/product/ERP5/skins/erp5_trade/inventory_list.form
index 487b8ed653..6aabc373ad 100755
--- a/product/ERP5/skins/erp5_trade/inventory_list.form
+++ b/product/ERP5/skins/erp5_trade/inventory_list.form
@@ -1,275 +1,55 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
-  <title>Purchase Packing List</title>
-  <name>purchase_packing_list_view</name>
-  <action>base_edit</action>
-  <enctype></enctype>
+  <title>Inventory</title>
+  <row_length>4</row_length>
+  <name>inventory_list</name>
+  <pt>form_list</pt>
+  <action>doSelect</action>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <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_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>
-          <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>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message 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>
-          <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>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message 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>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>base_jump_relation</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
-          <required type="int">0</required>
-          <title>Supplier</title>
-          <truncate type="int">0</truncate>
-          <update_method>base_update_relation</update_method>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message 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>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <jump_method>base_jump_relation</jump_method>
-          <max_length></max_length>
-          <portal_type type="list">[('Sale Order', 'Sales Order')]</portal_type>
-          <required type="int">0</required>
-          <title>Order</title>
-          <truncate type="int">0</truncate>
-          <update_method>base_update_relation</update_method>
-        </values>
-        <tales>
-        </tales>
-        <messages>
-          <message name="external_validator_failed">The input failed the external validator.</message>
-          <message 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>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <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>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <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>
-          <alternate_name></alternate_name>
-          <css_class></css_class>
-          <date_only type="int">1</date_only>
-          <date_separator>/</date_separator>
-          <default_now type="int">0</default_now>
-          <description></description>
-          <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>
-          <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>
-          <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>
           <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_inventory', 'Wanted Inventory'), ('inventory', 'Inventory')]</columns>
+          <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_columns type="list">[('inventory', 'Inventory')]</editable_columns>
+          <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>folder_contents</list_action>
-          <list_method type="method">searchFolder</list_method>
+          <list_action>list</list_action>
+          <list_method type="method">portal_catalog</list_method>
           <meta_types type="list">[]</meta_types>
-          <portal_types type="list">[]</portal_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 type="int">0</search>
-          <select type="int">0</select>
-          <selection_name>purchase_packing_list_line_selection</selection_name>
+          <search type="int">1</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_method></stat_method>
-          <title>Purchase Packing List Lines</title>
+          <title>Inventory List</title>
         </values>
         <tales>
         </tales>
@@ -280,31 +60,21 @@
       </fields>
     </group>
     <group>
-      <title>hidden</title>
+      <title>right</title>
+      <fields>
+
+      </fields>
+    </group>
+    <group>
+      <title>center</title>
+      <fields>
+
+      </fields>
+    </group>
+    <group>
+      <title>bottom</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>
-          <external_validator></external_validator>
-          <extra></extra>
-          <hidden type="int">0</hidden>
-          <required type="int">0</required>
-          <title>Inventory</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_float">You did not enter a floating point number.</message>
-        </messages>
-      </field>
       </fields>
     </group>
   </groups>
diff --git a/product/ERP5/skins/erp5_trade/inventory_view.form b/product/ERP5/skins/erp5_trade/inventory_view.form
index b0b3dac794..3ad5c8a8c7 100755
--- a/product/ERP5/skins/erp5_trade/inventory_view.form
+++ b/product/ERP5/skins/erp5_trade/inventory_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Purchase Packing List</title>
+  <row_length>4</row_length>
   <name>purchase_packing_list_view</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -63,12 +75,16 @@
       </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>
@@ -103,6 +119,8 @@
           <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>
@@ -112,7 +130,9 @@
           <required type="int">0</required>
           <title>Warehouse</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -133,6 +153,8 @@
           <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>
@@ -142,7 +164,9 @@
           <required type="int">0</required>
           <title>Owner</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -164,6 +188,8 @@
           <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>
@@ -173,6 +199,8 @@
           <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>
@@ -203,7 +231,9 @@
           <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>
@@ -215,6 +245,7 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">0</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>
@@ -241,11 +272,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/mail_message_view.form b/product/ERP5/skins/erp5_trade/mail_message_view.form
index 2d67da6230..c456340295 100755
--- a/product/ERP5/skins/erp5_trade/mail_message_view.form
+++ b/product/ERP5/skins/erp5_trade/mail_message_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Mail Message</title>
+  <row_length>4</row_length>
   <name>mail_message_view</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -20,7 +24,9 @@
           <default></default>
           <description></description>
           <display_maxwidth></display_maxwidth>
-          <display_width type="int">20</display_width>
+          <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>
@@ -28,6 +34,8 @@
           <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>
@@ -37,24 +45,27 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>event_state</id> <type>StringField</type>
+      <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">20</display_width>
+          <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>
           <max_length></max_length>
-          <required type="int">1</required>
-          <title>State</title>
+          <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>
-          <default>python:here.portal_workflow.getInfoFor(here, 'event_state')</default>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -62,21 +73,25 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_title</id> <type>StringField</type>
+      <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">20</display_width>
+          <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>
           <max_length></max_length>
           <required type="int">0</required>
-          <title>Subject</title>
+          <title>Date</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -86,27 +101,25 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_default_follow_up</id> <type>RelationStringField</type>
+      <field><id>my_title</id> <type>StringField</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>
+          <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_jump_relation</jump_method>
           <max_length></max_length>
-          <portal_type type="list">[('Sale Opportunity', 'Sale Opportunity')]</portal_type>
           <required type="int">0</required>
-          <title>Mail for</title>
+          <title>Subject</title>
           <truncate type="int">0</truncate>
-          <update_method>base_update_relation</update_method>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -122,21 +135,31 @@
       <title>right</title>
       <fields>
 
-      <field><id>my_to</id> <type>StringField</type>
+      <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_jump_relation</jump_method>
           <max_length></max_length>
+          <portal_type type="list">[('Person', 'Person')]</portal_type>
           <required type="int">0</required>
-          <title>To</title>
+          <title>Person</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -146,21 +169,31 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_date</id> <type>StringField</type>
+      <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_jump_relation</jump_method>
           <max_length></max_length>
+          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
           <required type="int">0</required>
-          <title>Date</title>
+          <title>Organisation</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -170,27 +203,31 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_person_title</id> <type>RelationStringField</type>
+      <field><id>my_follow_up</id> <type>RelationStringField</type>
         <values>
           <alternate_name></alternate_name>
-          <base_category>source</base_category>
-          <catalog_index>Title</catalog_index>
+          <base_category>follow_up</base_category>
+          <catalog_index>getRelativeUrl</catalog_index>
           <css_class></css_class>
           <default></default>
-          <default_module>person</default_module>
+          <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_jump_relation</jump_method>
           <max_length></max_length>
-          <portal_type type="list">[('Person', 'Person')]</portal_type>
+          <portal_type type="list">[('Sale Opportunity', 'Sale Opportunity'), ('Support Request', 'Support Request')]</portal_type>
           <required type="int">0</required>
-          <title>Person</title>
+          <title>Follow Up</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -200,29 +237,62 @@
           <message name="too_long">Too much input was given.</message>
         </messages>
       </field>
-      <field><id>my_organisation_title</id> <type>RelationStringField</type>
+      <field><id>my_default_follow_up_title</id> <type>RelationStringField</type>
         <values>
           <alternate_name></alternate_name>
-          <base_category>subordination</base_category>
+          <base_category>follow_up</base_category>
           <catalog_index>Title</catalog_index>
           <css_class></css_class>
           <default></default>
-          <default_module>organisation</default_module>
+          <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_jump_relation</jump_method>
           <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
+          <portal_type type="list">[('Sale Opportunity', 'Sale Opportunity'), ('Support Request', 'Support Request')]</portal_type>
           <required type="int">0</required>
-          <title>Organisation</title>
+          <title>Follow Up</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</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>
@@ -242,6 +312,8 @@
           <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">30</height>
@@ -251,7 +323,9 @@
           <max_lines></max_lines>
           <required type="int">0</required>
           <title>Body</title>
-          <width type="int">70</width>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
+          <width type="int">90</width>
         </values>
         <tales>
         </tales>
@@ -269,6 +343,45 @@
       <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">[('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 type="int">0</search>
+          <search_columns type="list">[]</search_columns>
+          <select type="int">0</select>
+          <selection_name></selection_name>
+          <sort type="list">[]</sort>
+          <stat_method></stat_method>
+          <title>Attachments</title>
+        </values>
+        <tales>
+        </tales>
+        <messages>
+          <message name="external_validator_failed">The input failed the external validator.</message>
+        </messages>
+      </field>
       </fields>
     </group>
   </groups>
diff --git a/product/ERP5/skins/erp5_trade/order_packing_list_line_view.form b/product/ERP5/skins/erp5_trade/order_packing_list_line_view.form
index 59bb36600b..9df89c673f 100755
--- a/product/ERP5/skins/erp5_trade/order_packing_list_line_view.form
+++ b/product/ERP5/skins/erp5_trade/order_packing_list_line_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -48,6 +56,8 @@
           <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>
@@ -57,7 +67,9 @@
           <required type="int">0</required>
           <title>Product</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -73,6 +85,8 @@
           <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>
@@ -82,6 +96,8 @@
           <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>
@@ -102,11 +118,14 @@
           <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>
@@ -124,11 +143,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/order_packing_list_list.form b/product/ERP5/skins/erp5_trade/order_packing_list_list.form
index 812376d430..b537c523e9 100755
--- a/product/ERP5/skins/erp5_trade/order_packing_list_list.form
+++ b/product/ERP5/skins/erp5_trade/order_packing_list_list.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_list</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -25,7 +29,9 @@
           <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>
@@ -37,6 +43,7 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">1</search>
+          <search_columns></search_columns>
           <select type="int">1</select>
           <selection_name>order_packing_list_selection</selection_name>
           <sort type="list">[('id', 'id')]</sort>
diff --git a/product/ERP5/skins/erp5_trade/order_packing_list_view.form b/product/ERP5/skins/erp5_trade/order_packing_list_view.form
index 72da36aa4b..8ef6ee5c83 100755
--- a/product/ERP5/skins/erp5_trade/order_packing_list_view.form
+++ b/product/ERP5/skins/erp5_trade/order_packing_list_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Order Packing List</title>
+  <row_length>4</row_length>
   <name>order_packing_list_view</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -72,6 +84,8 @@
           <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>
@@ -81,7 +95,9 @@
           <required type="int">0</required>
           <title>Supplier</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -102,6 +118,8 @@
           <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>
@@ -111,7 +129,9 @@
           <required type="int">0</required>
           <title>Order</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -129,12 +149,16 @@
 
       <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>
@@ -154,12 +178,16 @@
       </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>
@@ -179,12 +207,16 @@
       </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>
@@ -214,6 +246,8 @@
           <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>
@@ -223,6 +257,8 @@
           <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>
@@ -253,7 +289,9 @@
           <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>
@@ -265,6 +303,7 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">0</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>
@@ -291,11 +330,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/order_workflow_action.form b/product/ERP5/skins/erp5_trade/order_workflow_action.form
index 4ee87d9073..09786703a7 100755
--- a/product/ERP5/skins/erp5_trade/order_workflow_action.form
+++ b/product/ERP5/skins/erp5_trade/order_workflow_action.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Validate Workflow Action</title>
+  <row_length>4</row_length>
   <name>base_workflow_action</name>
+  <pt>form_view_dialog</pt>
   <action>workflow_status_modify</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -19,6 +23,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -42,12 +50,16 @@
       </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>
@@ -68,12 +80,16 @@
       </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>
@@ -106,6 +122,8 @@
           <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>
@@ -113,6 +131,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/packing_list_print.pt b/product/ERP5/skins/erp5_trade/packing_list_print.pt
index 3b3cbd6a1f..5e77ac18ec 100755
--- a/product/ERP5/skins/erp5_trade/packing_list_print.pt
+++ b/product/ERP5/skins/erp5_trade/packing_list_print.pt
@@ -9,19 +9,21 @@
 	</head>
 
 	<body bgcolor="#ffffff"
-                tal:define="client_invoice python:here.getDefaultValue('destination',portal_type=['Organisation']);
-                client_delivery python:here.getDefaultValue('destination',portal_type=['Organisation']);
+                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.contentValues(filter={'meta_type':'ERP5 Delivery Line'});
-                            total_price python: 0.0">
+                            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.getCorporateName()"/>
+    <td align=left tal:content="python: from_organisation.getTitle()"/>
     <td align=right tal:content="python: 'Tel : %s' % from_organisation.getDefaultTelephone().asText()"/>
   </tr>
   <tr>
@@ -66,8 +68,8 @@ from_organisation python:here.restrictedTraverse('/nexedi/organisation/nexedi');
     </tr>
 
     <tr>
-      <td align=left tal:content="python: client_invoice.getCorporateName()"/>
-      <td align=left tal:content="python: client_delivery.getCorporateName()"/>
+      <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()"/>
@@ -121,8 +123,8 @@ from_organisation python:here.restrictedTraverse('/nexedi/organisation/nexedi');
     </tr>
 
     <tr>
-      <th colspan=4 align=right>TVA 19.6 %</th>
-      <td colspan=2 align=right>101.92</td>
+      <th colspan=4 align=right tal:content="python: 'TVA ' + str(vat) + ' %'"></th>
+      <td colspan=2 align=right tal:content="python: total_vat"></td>
     </tr>
 
 
@@ -136,8 +138,8 @@ from_organisation python:here.restrictedTraverse('/nexedi/organisation/nexedi');
 <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=1 align=right>Somme à régler</th>
-      <th colspan=2 align=right>621.92</th>
+      <th colspan=2 align=right>Total à payer</th>
+      <th colspan=1 align=right tal:content="python: total_price + total_vat"></th>
     </tr>
 
     <tr>
@@ -158,4 +160,4 @@ VAT FR72440047504</h6></center></td>
 
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/packing_list_workflow_user_create_invoice_transaction.form b/product/ERP5/skins/erp5_trade/packing_list_workflow_user_create_invoice_transaction.form
index e7850e4701..bd0247b426 100755
--- a/product/ERP5/skins/erp5_trade/packing_list_workflow_user_create_invoice_transaction.form
+++ b/product/ERP5/skins/erp5_trade/packing_list_workflow_user_create_invoice_transaction.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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_status_modify</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -19,6 +23,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -46,6 +54,8 @@
           <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>
@@ -71,6 +81,8 @@
           <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>
@@ -78,6 +90,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/pricing_view.form b/product/ERP5/skins/erp5_trade/pricing_view.form
index e10e780d9e..77e799c2aa 100755
--- a/product/ERP5/skins/erp5_trade/pricing_view.form
+++ b/product/ERP5/skins/erp5_trade/pricing_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
-  <title>Elément tarif</title>
+  <title>Elément tarif</title>
+  <row_length>4</row_length>
   <name>element_tarfi_view</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,13 +25,17 @@
           <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>Elément</title>
+          <title>Elément</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -43,6 +51,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -72,11 +84,14 @@
           <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 défaut</title>
+          <title>Prix de vente par défaut</title>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -92,13 +107,19 @@
           <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>
+          <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>
@@ -119,7 +140,9 @@
           <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>
@@ -127,7 +150,7 @@
           <lines type="list">[('None', 'None')]</lines>
           <setter_method></setter_method>
           <tabs type="list">[]</tabs>
-          <title>Prix par quantités</title>
+          <title>Prix par quantités</title>
           <update_cell_range type="int">0</update_cell_range>
         </values>
         <tales>
@@ -150,13 +173,19 @@
           <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>
@@ -174,14 +203,19 @@
           <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/getFormItemList</items>
@@ -204,6 +238,8 @@
           <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>
@@ -213,6 +249,8 @@
           <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>
@@ -245,11 +283,14 @@
           <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>
@@ -266,6 +307,8 @@
           <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>
@@ -275,6 +318,10 @@
           <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>
@@ -296,6 +343,8 @@
           <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>
@@ -303,6 +352,8 @@
           <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>
@@ -319,6 +370,8 @@
           <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>
@@ -328,6 +381,10 @@
           <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>
@@ -346,6 +403,8 @@
           <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>
@@ -355,6 +414,10 @@
           <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>
@@ -375,6 +438,8 @@
           <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>
@@ -382,6 +447,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/product_list.form b/product/ERP5/skins/erp5_trade/product_list.form
index d0c4152b33..61664f38d4 100755
--- a/product/ERP5/skins/erp5_trade/product_list.form
+++ b/product/ERP5/skins/erp5_trade/product_list.form
@@ -1,31 +1,37 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Product</title>
-  <name>accounting_transaction_list</name>
-  <action></action>
-  <enctype></enctype>
-  <method>POST</method>
+  <row_length>4</row_length>
+  <name>product_list</name>
   <pt>form_list</pt>
-
+  <action>doSelect</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>
+      <title>left</title>
       <fields>
 
-      <field><id>product_list</id> <type>ListBox</type>
+      <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">[('id', 'id'), ('description', 'Description'), ('title', 'Title'), ('validation_state', 'State')]</columns>
+          <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>
@@ -37,9 +43,11 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">1</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_method></stat_method>
           <title>Product List</title>
         </values>
@@ -51,5 +59,23 @@
       </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
index c2f3896979..31d23892c1 100755
--- a/product/ERP5/skins/erp5_trade/product_view.form
+++ b/product/ERP5/skins/erp5_trade/product_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -72,6 +84,8 @@
           <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>
@@ -81,7 +95,9 @@
           <required type="int">0</required>
           <title>Supplier</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -97,14 +113,19 @@
           <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/getFormItemList</items>
@@ -121,6 +142,8 @@
           <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>
@@ -128,8 +151,10 @@
           <max_length></max_length>
           <max_linelength></max_linelength>
           <max_lines></max_lines>
-          <required type="int">1</required>
+          <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>
@@ -150,6 +175,8 @@
           <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>
@@ -157,6 +184,8 @@
           <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>
@@ -181,11 +210,14 @@
           <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>
@@ -203,11 +235,14 @@
           <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>
@@ -225,11 +260,14 @@
           <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>
@@ -247,11 +285,14 @@
           <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>
@@ -269,11 +310,14 @@
           <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>
@@ -291,11 +335,14 @@
           <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>
@@ -314,11 +361,14 @@
           <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>
@@ -330,12 +380,16 @@
       </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>
diff --git a/product/ERP5/skins/erp5_trade/publication_workflow_validate.form b/product/ERP5/skins/erp5_trade/publication_workflow_validate.form
index d17c5555aa..801d89c81f 100755
--- a/product/ERP5/skins/erp5_trade/publication_workflow_validate.form
+++ b/product/ERP5/skins/erp5_trade/publication_workflow_validate.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Offer Sales</title>
+  <row_length>4</row_length>
   <name>sales_offer</name>
+  <pt>form_view_dialog</pt>
   <action>workflow_status_modify</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view_dialog</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>Default</title>
@@ -19,6 +23,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -48,6 +56,8 @@
           <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>
@@ -55,6 +65,8 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/purchase_invoice_transaction_line_view.form b/product/ERP5/skins/erp5_trade/purchase_invoice_transaction_line_view.form
index 9784576634..9f76ec2eb0 100755
--- a/product/ERP5/skins/erp5_trade/purchase_invoice_transaction_line_view.form
+++ b/product/ERP5/skins/erp5_trade/purchase_invoice_transaction_line_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,11 +53,14 @@
           <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>
@@ -65,14 +76,19 @@
           <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>
@@ -88,14 +104,19 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/purchase_invoice_transaction_view.form b/product/ERP5/skins/erp5_trade/purchase_invoice_transaction_view.form
index e030391d32..63f650ce5e 100755
--- a/product/ERP5/skins/erp5_trade/purchase_invoice_transaction_view.form
+++ b/product/ERP5/skins/erp5_trade/purchase_invoice_transaction_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -48,6 +56,8 @@
           <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>
@@ -57,7 +67,9 @@
           <required type="int">0</required>
           <title>Destination Section</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -78,6 +90,8 @@
           <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>
@@ -87,7 +101,9 @@
           <required type="int">0</required>
           <title>Source Section</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -99,12 +115,16 @@
       </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>
@@ -124,12 +144,16 @@
       </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>
@@ -153,14 +177,19 @@
           <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>
@@ -201,7 +230,9 @@
           <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>
@@ -213,6 +244,7 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">0</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>
@@ -239,6 +271,8 @@
           <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>
@@ -246,6 +280,8 @@
           <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>
@@ -261,14 +297,19 @@
           <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>
@@ -284,14 +325,19 @@
           <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>
@@ -309,11 +355,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/purchase_order_line_view.form b/product/ERP5/skins/erp5_trade/purchase_order_line_view.form
index a5f5f51806..30d9e9194d 100755
--- a/product/ERP5/skins/erp5_trade/purchase_order_line_view.form
+++ b/product/ERP5/skins/erp5_trade/purchase_order_line_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Purchase Order Line</title>
+  <row_length>4</row_length>
   <name>purchase_order_line_view</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -24,6 +28,8 @@
           <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>
@@ -33,7 +39,9 @@
           <required type="int">0</required>
           <title>Product</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -51,11 +59,14 @@
           <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>
@@ -71,6 +82,8 @@
           <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>
@@ -80,6 +93,8 @@
           <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>
@@ -104,14 +119,19 @@
           <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/getFormItemList</items>
@@ -130,11 +150,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/purchase_order_list.form b/product/ERP5/skins/erp5_trade/purchase_order_list.form
index df26e15352..cda3f02374 100755
--- a/product/ERP5/skins/erp5_trade/purchase_order_list.form
+++ b/product/ERP5/skins/erp5_trade/purchase_order_list.form
@@ -1,19 +1,23 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
-  <title>Purchase Order List</title>
+  <title>Purchase Order</title>
+  <row_length>4</row_length>
   <name>purchase_order_list</name>
-  <action></action>
-  <enctype></enctype>
-  <method>POST</method>
   <pt>form_list</pt>
-
+  <action>doSelect</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>
+      <title>left</title>
       <fields>
 
-      <field><id>purchase_order_list</id> <type>ListBox</type>
+      <field><id>listbox</id> <type>ListBox</type>
         <values>
           <all_columns type="list">[]</all_columns>
           <all_editable_columns type="list">[]</all_editable_columns>
@@ -25,7 +29,9 @@
           <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>
@@ -37,9 +43,11 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">1</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_method></stat_method>
           <title>Purchase Order List</title>
         </values>
@@ -51,5 +59,23 @@
       </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/purchase_order_view.form b/product/ERP5/skins/erp5_trade/purchase_order_view.form
index 7b26ec5374..ebff34d9a5 100755
--- a/product/ERP5/skins/erp5_trade/purchase_order_view.form
+++ b/product/ERP5/skins/erp5_trade/purchase_order_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -63,12 +75,16 @@
       </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>
@@ -88,12 +104,16 @@
       </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>
@@ -128,6 +148,8 @@
           <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>
@@ -137,7 +159,9 @@
           <required type="int">0</required>
           <title>Supplier</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -158,6 +182,8 @@
           <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>
@@ -167,7 +193,9 @@
           <required type="int">0</required>
           <title>Buyer</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -189,6 +217,8 @@
           <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>
@@ -198,6 +228,8 @@
           <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>
@@ -228,7 +260,9 @@
           <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>
@@ -240,6 +274,7 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">0</search>
+          <search_columns></search_columns>
           <select type="int">0</select>
           <selection_name>sale_order_line_selection</selection_name>
           <sort type="list">[('id', 'id')]</sort>
@@ -266,11 +301,14 @@
           <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>
@@ -286,14 +324,19 @@
           <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/getFormItemList</items>
diff --git a/product/ERP5/skins/erp5_trade/purchase_packing_list_line_view.form b/product/ERP5/skins/erp5_trade/purchase_packing_list_line_view.form
index 213ad319e4..f6ca65101e 100755
--- a/product/ERP5/skins/erp5_trade/purchase_packing_list_line_view.form
+++ b/product/ERP5/skins/erp5_trade/purchase_packing_list_line_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -48,6 +56,8 @@
           <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>
@@ -57,7 +67,9 @@
           <required type="int">0</required>
           <title>Product</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -73,6 +85,8 @@
           <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>
@@ -82,6 +96,8 @@
           <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>
@@ -102,11 +118,14 @@
           <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>
@@ -124,11 +143,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/purchase_packing_list_list.form b/product/ERP5/skins/erp5_trade/purchase_packing_list_list.form
index 2a1b71cf1b..4b7fc99f7a 100755
--- a/product/ERP5/skins/erp5_trade/purchase_packing_list_list.form
+++ b/product/ERP5/skins/erp5_trade/purchase_packing_list_list.form
@@ -1,19 +1,23 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Purchase Packing List</title>
-  <name>accounting_transaction_list</name>
-  <action></action>
-  <enctype></enctype>
-  <method>POST</method>
+  <row_length>4</row_length>
+  <name>purchase_packing_list_list</name>
   <pt>form_list</pt>
-
+  <action>doSelect</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>
+      <title>left</title>
       <fields>
 
-      <field><id>order_packing_list_list</id> <type>ListBox</type>
+      <field><id>listbox</id> <type>ListBox</type>
         <values>
           <all_columns type="list">[]</all_columns>
           <all_editable_columns type="list">[]</all_editable_columns>
@@ -25,7 +29,9 @@
           <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>
@@ -37,11 +43,13 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">1</search>
+          <search_columns type="list">[]</search_columns>
           <select type="int">1</select>
-          <selection_name>order_packing_list_selection</selection_name>
+          <selection_name>purchase_packing_list_selection</selection_name>
           <sort type="list">[('id', 'id')]</sort>
+          <sort_columns type="list">[]</sort_columns>
           <stat_method></stat_method>
-          <title>Order Packing List List</title>
+          <title>Purchase Packing List List</title>
         </values>
         <tales>
         </tales>
@@ -51,5 +59,23 @@
       </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/purchase_packing_list_view.form b/product/ERP5/skins/erp5_trade/purchase_packing_list_view.form
index 3de7858b4b..f99b4f5f88 100755
--- a/product/ERP5/skins/erp5_trade/purchase_packing_list_view.form
+++ b/product/ERP5/skins/erp5_trade/purchase_packing_list_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Purchase Packing List</title>
+  <row_length>4</row_length>
   <name>purchase_packing_list_view</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -72,6 +84,8 @@
           <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>
@@ -81,7 +95,9 @@
           <required type="int">0</required>
           <title>Supplier</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -102,6 +118,8 @@
           <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>
@@ -111,7 +129,9 @@
           <required type="int">0</required>
           <title>Order</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -129,12 +149,16 @@
 
       <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>
@@ -154,12 +178,16 @@
       </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>
@@ -179,12 +207,16 @@
       </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>
@@ -214,6 +246,8 @@
           <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>
@@ -223,6 +257,8 @@
           <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>
@@ -253,7 +289,9 @@
           <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>
@@ -265,6 +303,7 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">0</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>
@@ -291,11 +330,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/sale_invoice_transaction_line_view.form b/product/ERP5/skins/erp5_trade/sale_invoice_transaction_line_view.form
index 41ab8be7f9..1d7c6832e8 100755
--- a/product/ERP5/skins/erp5_trade/sale_invoice_transaction_line_view.form
+++ b/product/ERP5/skins/erp5_trade/sale_invoice_transaction_line_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,11 +53,14 @@
           <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>
@@ -65,14 +76,19 @@
           <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>
@@ -88,14 +104,19 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/sale_invoice_transaction_view.form b/product/ERP5/skins/erp5_trade/sale_invoice_transaction_view.form
index f93e77f057..3a6783824a 100755
--- a/product/ERP5/skins/erp5_trade/sale_invoice_transaction_view.form
+++ b/product/ERP5/skins/erp5_trade/sale_invoice_transaction_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -48,6 +56,8 @@
           <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>
@@ -57,7 +67,9 @@
           <required type="int">0</required>
           <title>Destination Section</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -78,6 +90,8 @@
           <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>
@@ -87,7 +101,9 @@
           <required type="int">0</required>
           <title>Source Section</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -99,12 +115,16 @@
       </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>
@@ -124,12 +144,16 @@
       </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>
@@ -153,14 +177,19 @@
           <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>
@@ -201,7 +230,9 @@
           <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>
@@ -209,10 +240,11 @@
           <list_action>folder_contents</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')]</portal_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></search_columns>
           <select type="int">1</select>
           <selection_name>purchase_invoice_transaction_line_selection</selection_name>
           <sort type="list">[('id', 'id')]</sort>
@@ -239,6 +271,8 @@
           <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>
@@ -246,6 +280,8 @@
           <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>
@@ -261,14 +297,19 @@
           <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>
@@ -284,14 +325,19 @@
           <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>
@@ -309,11 +355,14 @@
           <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>
@@ -326,4 +375,4 @@
       </fields>
     </group>
   </groups>
-</form>
+</form>
\ No newline at end of file
diff --git a/product/ERP5/skins/erp5_trade/sale_order_line_view.form b/product/ERP5/skins/erp5_trade/sale_order_line_view.form
index a6c9426df5..8b2a782dca 100755
--- a/product/ERP5/skins/erp5_trade/sale_order_line_view.form
+++ b/product/ERP5/skins/erp5_trade/sale_order_line_view.form
@@ -1,18 +1,50 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Sale Order Line</title>
+  <row_length>4</row_length>
   <name>sale_order_list</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <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_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>
@@ -24,6 +56,8 @@
           <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>
@@ -33,7 +67,9 @@
           <required type="int">0</required>
           <title>Product or Service</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -51,11 +87,14 @@
           <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>
@@ -71,6 +110,8 @@
           <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>
@@ -80,6 +121,8 @@
           <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>
@@ -104,14 +147,19 @@
           <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/getFormItemList</items>
@@ -130,11 +178,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/sale_order_list.form b/product/ERP5/skins/erp5_trade/sale_order_list.form
index b906e7fce6..917519d74b 100755
--- a/product/ERP5/skins/erp5_trade/sale_order_list.form
+++ b/product/ERP5/skins/erp5_trade/sale_order_list.form
@@ -1,19 +1,23 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Sale Order List</title>
+  <row_length>4</row_length>
   <name>sale_order_list</name>
-  <action></action>
-  <enctype></enctype>
-  <method>POST</method>
   <pt>form_list</pt>
-
+  <action>doSelect</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>
+      <title>left</title>
       <fields>
 
-      <field><id>sale_order_list</id> <type>ListBox</type>
+      <field><id>listbox</id> <type>ListBox</type>
         <values>
           <all_columns type="list">[]</all_columns>
           <all_editable_columns type="list">[]</all_editable_columns>
@@ -25,7 +29,9 @@
           <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>
@@ -33,13 +39,15 @@
           <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', 'Sales Order')]</portal_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 type="int">1</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_method></stat_method>
           <title>Sale Order List</title>
         </values>
@@ -51,5 +59,23 @@
       </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/sale_order_view.form b/product/ERP5/skins/erp5_trade/sale_order_view.form
index 8b8f44003e..52731caa97 100755
--- a/product/ERP5/skins/erp5_trade/sale_order_view.form
+++ b/product/ERP5/skins/erp5_trade/sale_order_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -63,17 +75,21 @@
       </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>
+          <required type="int">0</required>
           <time_separator>:</time_separator>
           <title>Shipping Date</title>
         </values>
@@ -88,17 +104,21 @@
       </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>
+          <required type="int">0</required>
           <time_separator>:</time_separator>
           <title>Delivery Date</title>
         </values>
@@ -128,16 +148,20 @@
           <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_jump_relation</jump_method>
           <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
+          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
           <required type="int">0</required>
           <title>Client</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -158,6 +182,8 @@
           <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>
@@ -167,7 +193,9 @@
           <required type="int">0</required>
           <title>Buyer</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -189,6 +217,8 @@
           <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>
@@ -198,6 +228,8 @@
           <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>
@@ -228,7 +260,9 @@
           <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>
@@ -240,6 +274,7 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">0</search>
+          <search_columns></search_columns>
           <select type="int">0</select>
           <selection_name>sale_order_line_selection</selection_name>
           <sort type="list">[('id', 'id')]</sort>
@@ -266,11 +301,14 @@
           <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>
@@ -286,14 +324,19 @@
           <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/getFormItemList</items>
diff --git a/product/ERP5/skins/erp5_trade/sale_packing_list_line_view.form b/product/ERP5/skins/erp5_trade/sale_packing_list_line_view.form
index a632b06e5c..599ac74547 100755
--- a/product/ERP5/skins/erp5_trade/sale_packing_list_line_view.form
+++ b/product/ERP5/skins/erp5_trade/sale_packing_list_line_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Sale Packing List Line</title>
+  <row_length>4</row_length>
   <name>sale_order_list</name>
+  <pt>form_view</pt>
   <action>base_edit</action>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -43,6 +51,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -72,11 +84,14 @@
           <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>
@@ -94,11 +109,14 @@
           <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>
@@ -119,6 +137,8 @@
           <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>
@@ -128,7 +148,9 @@
           <required type="int">0</required>
           <title>Product or Service</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
diff --git a/product/ERP5/skins/erp5_trade/sale_packing_list_list.form b/product/ERP5/skins/erp5_trade/sale_packing_list_list.form
index bfcf2115b9..b2c11e8e9e 100755
--- a/product/ERP5/skins/erp5_trade/sale_packing_list_list.form
+++ b/product/ERP5/skins/erp5_trade/sale_packing_list_list.form
@@ -1,19 +1,23 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Sale Packing List</title>
-  <name>accounting_transaction_list</name>
-  <action></action>
-  <enctype></enctype>
-  <method>POST</method>
+  <row_length>4</row_length>
+  <name>sale_packing_list_list</name>
   <pt>form_list</pt>
-
+  <action>doSelect</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>
+      <title>left</title>
       <fields>
 
-      <field><id>sale_packing_list_list</id> <type>ListBox</type>
+      <field><id>listbox</id> <type>ListBox</type>
         <values>
           <all_columns type="list">[]</all_columns>
           <all_editable_columns type="list">[]</all_editable_columns>
@@ -25,7 +29,9 @@
           <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>
@@ -37,9 +43,11 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">1</search>
+          <search_columns type="list">[]</search_columns>
           <select type="int">1</select>
-          <selection_name>sale_order_selection</selection_name>
+          <selection_name>sale_packing_list_selection</selection_name>
           <sort type="list">[('id', 'id')]</sort>
+          <sort_columns type="list">[]</sort_columns>
           <stat_method></stat_method>
           <title>Sale Packing List</title>
         </values>
@@ -51,5 +59,23 @@
       </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/sale_packing_list_view.form b/product/ERP5/skins/erp5_trade/sale_packing_list_view.form
index 109fa9d2b3..83002ea498 100755
--- a/product/ERP5/skins/erp5_trade/sale_packing_list_view.form
+++ b/product/ERP5/skins/erp5_trade/sale_packing_list_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -72,16 +84,20 @@
           <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_jump_relation</jump_method>
           <max_length></max_length>
-          <portal_type type="list">[('Organisation', 'Organisation')]</portal_type>
+          <portal_type type="list">[('Organisation', 'Organisation'), ('Person', 'Person')]</portal_type>
           <required type="int">0</required>
           <title>Client</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -102,6 +118,8 @@
           <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>
@@ -109,9 +127,11 @@
           <max_length></max_length>
           <portal_type type="list">[('Sale Order', 'Sales Order')]</portal_type>
           <required type="int">0</required>
-          <title>Sale</title>
+          <title>Sale Order</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -129,17 +149,21 @@
 
       <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>
+          <required type="int">0</required>
           <time_separator>:</time_separator>
           <title>Deliver from</title>
         </values>
@@ -154,17 +178,21 @@
       </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>
+          <required type="int">0</required>
           <time_separator>:</time_separator>
           <title>Deliver before</title>
         </values>
@@ -179,12 +207,16 @@
       </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>
@@ -214,6 +246,8 @@
           <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>
@@ -223,6 +257,8 @@
           <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>
@@ -246,14 +282,16 @@
           <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>
+          <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_columns type="list">[('quantity', 'Quantity')]</editable_columns>
+          <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>
@@ -265,6 +303,7 @@
           <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>sale_packing_list_line_selection</selection_name>
           <sort type="list">[('id', 'id')]</sort>
@@ -283,7 +322,32 @@
       <title>hidden</title>
       <fields>
 
-      <field><id>listbox_quantity</id> <type>FloatField</type>
+      <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>
@@ -291,11 +355,14 @@
           <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>
diff --git a/product/ERP5/skins/erp5_trade/service_list.form b/product/ERP5/skins/erp5_trade/service_list.form
index 66f17af63a..ae29440abe 100755
--- a/product/ERP5/skins/erp5_trade/service_list.form
+++ b/product/ERP5/skins/erp5_trade/service_list.form
@@ -1,31 +1,37 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0"?>
 
 <form>
   <title>Service</title>
+  <row_length>4</row_length>
   <name>service_list</name>
-  <action></action>
-  <enctype></enctype>
-  <method>POST</method>
   <pt>form_list</pt>
-
+  <action>doSelect</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>
+      <title>left</title>
       <fields>
 
-      <field><id>product_list</id> <type>ListBox</type>
+      <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">[('id', 'id'), ('description', 'Description'), ('title', 'Title')]</columns>
+          <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>
@@ -37,9 +43,11 @@
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
           <search type="int">1</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_method></stat_method>
           <title>Service List</title>
         </values>
@@ -51,5 +59,23 @@
       </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
index bd3c994762..2c2728ada0 100755
--- a/product/ERP5/skins/erp5_trade/service_view.form
+++ b/product/ERP5/skins/erp5_trade/service_view.form
@@ -1,13 +1,17 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?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>
-  <enctype></enctype>
+  <update_action></update_action>
   <method>POST</method>
-  <pt>form_view</pt>
-
+  <enctype></enctype>
+  <encoding>UTF-8</encoding>
+  <stored_encoding>ISO-8859-1</stored_encoding>
+  <unicode_mode>false</unicode_mode>
   <groups>
     <group>
       <title>left</title>
@@ -21,6 +25,8 @@
           <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>
@@ -28,6 +34,8 @@
           <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>
@@ -45,6 +53,8 @@
           <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>
@@ -52,6 +62,8 @@
           <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>
@@ -72,6 +84,8 @@
           <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>
@@ -81,7 +95,9 @@
           <required type="int">0</required>
           <title>Supplier</title>
           <truncate type="int">0</truncate>
+          <unicode type="int">0</unicode>
           <update_method>base_update_relation</update_method>
+          <whitespace_preserve type="int">0</whitespace_preserve>
         </values>
         <tales>
         </tales>
@@ -97,17 +113,22 @@
           <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/getFormItemList</items>
+          <items>here/portal_categories/quantity_unit/getCategoryChildItemList</items>
         </tales>
         <messages>
           <message name="external_validator_failed">The input failed the external validator.</message>
@@ -121,6 +142,8 @@
           <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>
@@ -128,8 +151,10 @@
           <max_length></max_length>
           <max_linelength></max_linelength>
           <max_lines></max_lines>
-          <required type="int">1</required>
+          <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>
@@ -142,6 +167,77 @@
           <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>
@@ -156,11 +252,14 @@
           <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>
@@ -178,11 +277,14 @@
           <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>
@@ -201,11 +303,14 @@
           <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>
@@ -217,12 +322,16 @@
       </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>
-- 
2.30.9