From 9ff0c1dcd826cc5a79321d6d4707ea5e36e32f0e Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Tue, 20 Jan 2009 20:59:34 +0000
Subject: [PATCH] 2009-01-20 Guillaume * Field titles and descriptions clean
 up.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25213 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../Event_viewAcknowledgeActionDialog/your_comment.xml    | 4 ++--
 .../erp5_crm/Event_viewAssignDialog/your_comment.xml      | 4 ++--
 .../your_comment.xml                                      | 4 ++--
 .../erp5_crm/Event_viewFieldLibrary/my_start_date.xml     | 4 ++++
 .../erp5_crm/Event_viewFieldLibrary/my_title.xml          | 4 ++++
 .../erp5_crm/Event_viewRespondDialog/your_reply_to.xml    | 2 +-
 .../erp5_crm/Event_viewSendActionDialog/your_comment.xml  | 4 ++--
 .../Event_viewWorkflowAssignActionDialog/your_comment.xml | 4 ++--
 .../PersonModule_viewNewEventDialog/your_text_content.xml | 4 ++--
 .../Ticket_view/my_destination_decision_title.xml         | 8 ++++++++
 .../erp5_crm/Ticket_view/my_destination_project_title.xml | 2 +-
 .../erp5_crm/Ticket_view/my_destination_section_title.xml | 4 ++--
 .../erp5_crm/Ticket_view/my_destination_title.xml         | 8 ++++++++
 .../portal_skins/erp5_crm/Ticket_view/my_price.xml        | 4 ++--
 .../portal_skins/erp5_crm/Ticket_view/my_reference.xml    | 8 ++++++++
 .../erp5_crm/Ticket_view/my_source_decision_title.xml     | 8 ++++++++
 .../erp5_crm/Ticket_view/my_source_section_title.xml      | 2 +-
 .../portal_skins/erp5_crm/Ticket_view/my_source_title.xml | 8 ++++++++
 .../portal_skins/erp5_crm/Ticket_view/my_start_date.xml   | 8 ++++++++
 .../portal_skins/erp5_crm/Ticket_view/my_stop_date.xml    | 8 ++++++++
 .../my_destination_decision_title.xml                     | 2 +-
 .../my_destination_section_title.xml                      | 4 ++--
 .../Ticket_viewFieldLibrary/my_destination_title.xml      | 4 ++++
 .../erp5_crm/Ticket_viewFieldLibrary/my_reference.xml     | 4 ++++
 .../Ticket_viewFieldLibrary/my_source_decision_title.xml  | 4 ++++
 .../Ticket_viewFieldLibrary/my_source_section_title.xml   | 2 +-
 .../erp5_crm/Ticket_viewFieldLibrary/my_source_title.xml  | 4 ++++
 .../erp5_crm/Ticket_viewFieldLibrary/my_start_date.xml    | 4 ++++
 .../erp5_crm/Ticket_viewFieldLibrary/my_stop_date.xml     | 4 ++++
 .../erp5_crm/Ticket_viewNewBugDialog/your_description.xml | 6 +++++-
 .../Ticket_viewNewEventDialog/your_description.xml        | 2 +-
 .../erp5_crm/Ticket_viewNewEventDialog/your_title.xml     | 2 +-
 bt5/erp5_crm/bt/revision                                  | 2 +-
 .../BaseTradePurchase_FieldLibrary/my_base_price.xml      | 2 +-
 .../BaseTradePurchase_FieldLibrary/my_comment.xml         | 2 +-
 .../my_destination_reference.xml                          | 2 +-
 .../my_destination_title.xml                              | 2 +-
 .../BaseTradePurchase_FieldLibrary/my_expiration_date.xml | 2 +-
 .../BaseTradePurchase_FieldLibrary/my_priced_quantity.xml | 2 +-
 .../BaseTradePurchase_FieldLibrary/my_quantity.xml        | 2 +-
 .../BaseTradePurchase_FieldLibrary/my_resource_title.xml  | 4 ++--
 .../BaseTradeSale_FieldLibrary/my_base_price.xml          | 2 +-
 .../erp5_trade/BaseTradeSale_FieldLibrary/my_comment.xml  | 2 +-
 .../BaseTradeSale_FieldLibrary/my_description.xml         | 2 +-
 .../my_destination_reference.xml                          | 2 +-
 .../BaseTradeSale_FieldLibrary/my_destination_title.xml   | 2 +-
 .../BaseTradeSale_FieldLibrary/my_expiration_date.xml     | 2 +-
 .../BaseTradeSale_FieldLibrary/my_priced_quantity.xml     | 2 +-
 .../erp5_trade/BaseTradeSale_FieldLibrary/my_quantity.xml | 2 +-
 .../BaseTradeSale_FieldLibrary/my_resource_title.xml      | 4 ++--
 .../erp5_trade/ContainerLine_view/my_description.xml      | 2 +-
 .../erp5_trade/ContainerLine_view/my_quantity.xml         | 2 +-
 .../erp5_trade/ContainerLine_view/my_resource_title.xml   | 4 ++--
 .../erp5_trade/Container_view/my_description.xml          | 2 +-
 .../erp5_trade/DeliveryCell_view/my_resource_title.xml    | 8 ++++++++
 .../DeliveryCell_viewFieldLibrary/my_int_index.xml        | 4 ++--
 .../erp5_trade/InventoryCell_view/my_description.xml      | 2 +-
 .../erp5_trade/InventoryCell_view/my_resource_title.xml   | 4 ++--
 .../InventoryLine_viewFieldLibrary/my_int_index.xml       | 6 +++++-
 .../InventoryLine_viewFieldLibrary/my_reference.xml       | 2 +-
 .../InventoryLine_viewFieldLibrary/my_resource_title.xml  | 4 ++++
 .../OrderLine_viewFieldLibrary/my_destination_title.xml   | 2 +-
 .../OrderLine_viewFieldLibrary/my_int_index.xml           | 4 ++--
 .../erp5_trade/OrderLine_viewFieldLibrary/my_price.xml    | 4 ++++
 .../OrderLine_viewFieldLibrary/my_reference.xml           | 2 +-
 .../OrderLine_viewFieldLibrary/my_resource_title.xml      | 2 +-
 .../portal_skins/erp5_trade/Order_viewAsODTStyles.xml     | 2 +-
 .../erp5_trade/PackingList_viewAsODTStyles.xml            | 2 +-
 .../my_comment.xml                                        | 2 +-
 .../my_workflow_action.xml                                | 7 ++-----
 .../my_destination_payment.xml                            | 2 +-
 .../PaymentCondition_viewFieldLibrary/my_int_index.xml    | 4 ++--
 .../my_payment_additional_term.xml                        | 2 +-
 .../PaymentCondition_viewFieldLibrary/my_payment_term.xml | 2 +-
 .../my_source_payment.xml                                 | 2 +-
 .../my_destination_reference.xml                          | 2 +-
 .../PurchaseOrder_viewFieldLibrary/my_reference.xml       | 2 +-
 .../my_source_reference.xml                               | 2 +-
 .../my_comment.xml                                        | 4 ++++
 .../my_destination_payment.xml                            | 2 +-
 .../my_destination_payment_title.xml                      | 4 ++++
 .../my_destination_title.xml                              | 2 +-
 .../my_expiration_date.xml                                | 2 +-
 .../my_source_payment.xml                                 | 2 +-
 .../ReturnedSalePackingList_view/my_comment.xml           | 2 +-
 .../ReturnedSalePackingList_view/my_destination_title.xml | 2 +-
 .../erp5_trade/ReturnedSalePackingList_view/my_title.xml  | 2 +-
 .../portal_skins/erp5_trade/SaleOrder_view/my_comment.xml | 8 ++++++++
 .../erp5_trade/Tax_viewFieldLibrary/my_quantity.xml       | 2 +-
 .../erp5_trade/Tax_viewFieldLibrary/my_reference.xml      | 2 +-
 bt5/erp5_trade/bt/revision                                | 2 +-
 91 files changed, 215 insertions(+), 90 deletions(-)

diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_comment.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_comment.xml
index 9c5f31bb0b..7610701ad4 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_comment.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAcknowledgeActionDialog/your_comment.xml
@@ -218,7 +218,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Text area field</string> </value>
+                    <value> <string>Comments which can be read by internal users but unlike description, are not printed out on official documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
@@ -262,7 +262,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Comment</string> </value>
+                    <value> <string>Comments</string> </value>
                 </item>
                 <item>
                     <key> <string>unicode</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAssignDialog/your_comment.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAssignDialog/your_comment.xml
index 4e461e421e..22f67e5e1e 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAssignDialog/your_comment.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewAssignDialog/your_comment.xml
@@ -216,7 +216,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Text area field</string> </value>
+                    <value> <string>Comments which can be read by internal users but unlike description, are not printed out on official documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
@@ -260,7 +260,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Comment</string> </value>
+                    <value> <string>Comments</string> </value>
                 </item>
                 <item>
                     <key> <string>unicode</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewCreateRelatedEventActionDialog/your_comment.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewCreateRelatedEventActionDialog/your_comment.xml
index 9c5f31bb0b..7610701ad4 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewCreateRelatedEventActionDialog/your_comment.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewCreateRelatedEventActionDialog/your_comment.xml
@@ -218,7 +218,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Text area field</string> </value>
+                    <value> <string>Comments which can be read by internal users but unlike description, are not printed out on official documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
@@ -262,7 +262,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Comment</string> </value>
+                    <value> <string>Comments</string> </value>
                 </item>
                 <item>
                     <key> <string>unicode</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_start_date.xml
index 42ede89682..d6e08190d4 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_start_date.xml
@@ -95,6 +95,10 @@
                     <key> <string>default_now</string> </key>
                     <value> <int>1</int> </value>
                 </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>The date at which the event was created</string> </value>
+                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>1</int> </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_title.xml
index 019a48df0b..ba2bb196bc 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewFieldLibrary/my_title.xml
@@ -85,6 +85,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>The name of a document in ERP5</string> </value>
+                </item>
                 <item>
                     <key> <string>editable</string> </key>
                     <value> <int>1</int> </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRespondDialog/your_reply_to.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRespondDialog/your_reply_to.xml
index 70ca2b12ff..bd5486fab2 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRespondDialog/your_reply_to.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewRespondDialog/your_reply_to.xml
@@ -242,7 +242,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>To</string> </value>
+                    <value> <string>Reply to</string> </value>
                 </item>
                 <item>
                     <key> <string>truncate</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewSendActionDialog/your_comment.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewSendActionDialog/your_comment.xml
index 9c5f31bb0b..7610701ad4 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewSendActionDialog/your_comment.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewSendActionDialog/your_comment.xml
@@ -218,7 +218,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Text area field</string> </value>
+                    <value> <string>Comments which can be read by internal users but unlike description, are not printed out on official documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
@@ -262,7 +262,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Comment</string> </value>
+                    <value> <string>Comments</string> </value>
                 </item>
                 <item>
                     <key> <string>unicode</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_comment.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_comment.xml
index 7cc3992b78..b48870d3d4 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_comment.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewWorkflowAssignActionDialog/your_comment.xml
@@ -85,7 +85,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Text area field</string> </value>
+                    <value> <string>Comments which can be read by internal users but unlike description, are not printed out on official documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
@@ -105,7 +105,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Comment</string> </value>
+                    <value> <string>Comments</string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewNewEventDialog/your_text_content.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewNewEventDialog/your_text_content.xml
index 35fee144c8..decbdc4d34 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewNewEventDialog/your_text_content.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/PersonModule_viewNewEventDialog/your_text_content.xml
@@ -110,7 +110,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>content of the event</string> </value>
+                    <value> <string>The content of the document considered as a text string</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
@@ -134,7 +134,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Body</string> </value>
+                    <value> <string>Text</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_decision_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_decision_title.xml
index 2c617bca6a..b666ca6413 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_decision_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_decision_title.xml
@@ -108,6 +108,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>Tells who requested the ticket</string> </value>
+                </item>
                 <item>
                     <key> <string>extra_context</string> </key>
                     <value>
@@ -122,6 +126,10 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Ticket_viewFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Requester</string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_project_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_project_title.xml
index 4528d52e65..d2c9c28c41 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_project_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_project_title.xml
@@ -77,7 +77,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>define to which project ticket is related</string> </value>
+                    <value> <string>The accountable project on the requester side.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_section_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_section_title.xml
index c9a3e16b6c..7ab4a87353 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_section_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_section_title.xml
@@ -148,7 +148,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>defined to whi the invoice will be sent</string> </value>
+                    <value> <string>Defines to who the invoice will be sent</string> </value>
                 </item>
                 <item>
                     <key> <string>extra_context</string> </key>
@@ -166,7 +166,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Billable Client</string> </value>
+                    <value> <string>Client</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_title.xml
index 87a304c487..45f6117256 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_destination_title.xml
@@ -72,6 +72,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>The person or organization for which the services are being provided.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_destination_title</string> </value>
@@ -84,6 +88,10 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Location</string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_price.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_price.xml
index 4f010e2fd4..fc8c25bf15 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_price.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_price.xml
@@ -74,7 +74,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Price for one unit.</string> </value>
+                    <value> <string>The unit price at which a product or service is traded. This price is a net price which has been applied all pricing conditions defined in supply documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
@@ -90,7 +90,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Unit Price</string> </value>
+                    <value> <string>Price</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_reference.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_reference.xml
index f21ede5512..78273b09b8 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_reference.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_reference.xml
@@ -72,6 +72,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>Reference of a document in ERP5, whatever the module considered. Exceptions to this rule can exist, and if so, terms will be described in the appropriate business field of this glossary. For example, the reference of a Payment Transaction has a specific name, as well as the Reference of Purchase and Sale Invoice Transactions. See the appropriate Glossary for further information.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_reference</string> </value>
@@ -84,6 +88,10 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Reference</string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_decision_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_decision_title.xml
index e181202310..21a0e4c5e1 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_decision_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_decision_title.xml
@@ -144,6 +144,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>Title of the entity which is responsible of accepting the ticket request</string> </value>
+                </item>
                 <item>
                     <key> <string>extra_context</string> </key>
                     <value>
@@ -158,6 +162,10 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Ticket_viewFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Supervisor</string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_section_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_section_title.xml
index 9a0c16c87d..957969035d 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_section_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_section_title.xml
@@ -146,7 +146,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>defined who will provide the bill</string> </value>
+                    <value> <string>Defines who will provide the bill</string> </value>
                 </item>
                 <item>
                     <key> <string>extra_context</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_title.xml
index cd171e1c27..f952a4b583 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_source_title.xml
@@ -144,6 +144,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>The person who is handling the ticket.</string> </value>
+                </item>
                 <item>
                     <key> <string>extra_context</string> </key>
                     <value>
@@ -158,6 +162,10 @@
                     <key> <string>form_id</string> </key>
                     <value> <string>Ticket_viewFieldLibrary</string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Operations Manager</string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_start_date.xml
index 8e11101ba4..a4f3eb5d0c 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_start_date.xml
@@ -72,6 +72,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>The date at which the ticket was created.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_start_date</string> </value>
@@ -84,6 +88,10 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Begin Date</string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_stop_date.xml
index cca24d910e..aac496e2b7 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_stop_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_view/my_stop_date.xml
@@ -72,6 +72,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>The date at which the ticket is supposed to stop.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_stop_date</string> </value>
@@ -84,6 +88,10 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>End Date</string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_decision_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_decision_title.xml
index c9658f887c..0a72185539 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_decision_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_decision_title.xml
@@ -89,7 +89,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Tell who requested the ticket</string> </value>
+                    <value> <string>Tells who requested the ticket</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_section_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_section_title.xml
index 1917727d09..dda8bc74cb 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_section_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_section_title.xml
@@ -87,7 +87,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>defined to whi the invoice will be sent</string> </value>
+                    <value> <string>Defines to who the invoice will be sent</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
@@ -118,7 +118,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Billable Client</string> </value>
+                    <value> <string>Client</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_title.xml
index 45543c5e87..71dd505fd4 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_destination_title.xml
@@ -85,6 +85,10 @@
                     <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>The person or organization for which the services are being provided.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_relation_field</string> </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_reference.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_reference.xml
index 6c8c8d2d79..294212529a 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_reference.xml
@@ -74,6 +74,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>Reference of a document in ERP5, whatever the module considered. Exceptions to this rule can exist, and if so, terms will be described in the appropriate business field of this glossary. For example, the reference of a Payment Transaction has a specific name, as well as the Reference of Purchase and Sale Invoice Transactions. See the appropriate Glossary for further information.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_string_field</string> </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_decision_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_decision_title.xml
index 6fb5e6d68e..d29b3f82f0 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_decision_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_decision_title.xml
@@ -90,6 +90,10 @@
                     <key> <string>default_module</string> </key>
                     <value> <string>organisation</string> </value>
                 </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>Title of the entity which is responsible of accepting the ticket request</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_relation_field</string> </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_section_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_section_title.xml
index f942524773..5ab333ad8a 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_section_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_section_title.xml
@@ -87,7 +87,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>defined who will provide the bill</string> </value>
+                    <value> <string>Defines who will provide the bill</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_title.xml
index 53c8869c19..698b3c233d 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_source_title.xml
@@ -85,6 +85,10 @@
                     <key> <string>catalog_index</string> </key>
                     <value> <string>title</string> </value>
                 </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>The person who is handling the ticket.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_relation_field</string> </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_start_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_start_date.xml
index 0b3d387bf8..a6203acfc9 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_start_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_start_date.xml
@@ -74,6 +74,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>The date at which the ticket was created.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_date</string> </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_stop_date.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_stop_date.xml
index dd5d52edc8..9e1a4045b6 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_stop_date.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewFieldLibrary/my_stop_date.xml
@@ -74,6 +74,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>The date at which the ticket is supposed to stop.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_date</string> </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewBugDialog/your_description.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewBugDialog/your_description.xml
index 152ac9dde9..5aea2ae81c 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewBugDialog/your_description.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewBugDialog/your_description.xml
@@ -78,7 +78,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>A description of the event</string> </value>
+                    <value> <string>General description of a document in ERP5. Descriptions are not supposed to be internal, and in a case of certain documents such as invoices for example, will be seen by your customers.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
@@ -92,6 +92,10 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Description</string> </value>
+                </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>
                     <value> <int>0</int> </value>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_description.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_description.xml
index e5682e56b9..ca0ca10d87 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_description.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_description.xml
@@ -216,7 +216,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>A description of the event</string> </value>
+                    <value> <string>General description of a document in ERP5. Descriptions are not supposed to be internal, and in a case of certain documents such as invoices for example, will be seen by your customers.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_title.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_title.xml
index 280103e100..314a6ef183 100644
--- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_title.xml
+++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_viewNewEventDialog/your_title.xml
@@ -200,7 +200,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>The name of a document in ERP5</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision
index b6e81543f7..4f37670799 100644
--- a/bt5/erp5_crm/bt/revision
+++ b/bt5/erp5_crm/bt/revision
@@ -1 +1 @@
-330
\ No newline at end of file
+333
\ No newline at end of file
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_base_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_base_price.xml
index 7cceb39a7c..000ffd5e11 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_base_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_base_price.xml
@@ -212,7 +212,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Base Price</string> </value>
+                    <value> <string>Unit Base Price</string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_comment.xml
index f07f44f6a9..ef4f2a6aa8 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_comment.xml
@@ -77,7 +77,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Comments which can be read by internal users but which, unlike description, are not printed out on official documents.</string> </value>
+                    <value> <string>Comments which can be read by internal users but unlike description, are not printed out on official documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_reference.xml
index 04c2ce510f..d56b2d47e1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_reference.xml
@@ -200,7 +200,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The reference for the client.</string> </value>
+                    <value> <string>The reference of the client.</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_title.xml
index d3a2021669..028442248a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_destination_title.xml
@@ -77,7 +77,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The organisation or person to whom merchandise or service is delivered over or provided to.</string> </value>
+                    <value> <string>The organisation or person who is delivered goods or services in this operation</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_expiration_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_expiration_date.xml
index 35fc584318..55cf6fd584 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_expiration_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_expiration_date.xml
@@ -76,7 +76,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The date until which the offer is valid.</string> </value>
+                    <value> <string>The date when the document expires.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_priced_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_priced_quantity.xml
index b710ff3d56..88b734ee33 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_priced_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_priced_quantity.xml
@@ -196,7 +196,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Number of units involved in base prices</string> </value>
+                    <value> <string>Number of units involved in base prices. If Priced Quantity is 1, it means that this is a unit price. If 2, the price is given for two units, etc...</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_quantity.xml
index b3396a33a2..5e139bb599 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_quantity.xml
@@ -192,7 +192,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Default quantity</string> </value>
+                    <value> <string>Default Quantity of a resource in ERP5. It can be a product or it can be time quantity like hours or minutes for example. Quantity can be found in almost every business field of ERP5 and will always have this meaning, unless the term is different or precise, such as Priced Quantity for example.</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_resource_title.xml
index 1cd5293ad9..b62daeeb99 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradePurchase_FieldLibrary/my_resource_title.xml
@@ -382,7 +382,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>A resource in ERP5 can be a product or a service. This term will be found in orders for instance, or accounting and inventories.</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
@@ -475,7 +475,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Resource</string> </value>
+                    <value> <string>Product or Service</string> </value>
                 </item>
                 <item>
                     <key> <string>truncate</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_base_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_base_price.xml
index 7cceb39a7c..000ffd5e11 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_base_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_base_price.xml
@@ -212,7 +212,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Base Price</string> </value>
+                    <value> <string>Unit Base Price</string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_comment.xml
index ad34fb3fac..fbd49344dc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_comment.xml
@@ -216,7 +216,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Comments which can be read by internal users but which, unlike description, are not printed out on official documents.</string> </value>
+                    <value> <string>Comments which can be read by internal users but unlike description, are not printed out on official documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_description.xml
index f896debcc7..2eaaf13227 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_description.xml
@@ -216,7 +216,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>General description which may be printed out on official documents and read by suppliers and clients.</string> </value>
+                    <value> <string>General description of a document in ERP5. Descriptions are not supposed to be internal, and in a case of certain documents such as invoices for example, will be seen by your customers.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_reference.xml
index 04c2ce510f..d56b2d47e1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_reference.xml
@@ -200,7 +200,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The reference for the client.</string> </value>
+                    <value> <string>The reference of the client.</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_title.xml
index 9370fce9a2..f97fb5568e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_destination_title.xml
@@ -378,7 +378,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The organisation or person to whom merchandise or service is delivered over or provided to.</string> </value>
+                    <value> <string>The organisation or person who is delivered goods or services in this operation</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_expiration_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_expiration_date.xml
index 4e1be1938c..527bd5ce9f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_expiration_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_expiration_date.xml
@@ -256,7 +256,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The date until which the offer is valid.</string> </value>
+                    <value> <string>The date when the document expires.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_priced_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_priced_quantity.xml
index b710ff3d56..88b734ee33 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_priced_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_priced_quantity.xml
@@ -196,7 +196,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Number of units involved in base prices</string> </value>
+                    <value> <string>Number of units involved in base prices. If Priced Quantity is 1, it means that this is a unit price. If 2, the price is given for two units, etc...</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_quantity.xml
index b3396a33a2..5e139bb599 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_quantity.xml
@@ -192,7 +192,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Default quantity</string> </value>
+                    <value> <string>Default Quantity of a resource in ERP5. It can be a product or it can be time quantity like hours or minutes for example. Quantity can be found in almost every business field of ERP5 and will always have this meaning, unless the term is different or precise, such as Priced Quantity for example.</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_resource_title.xml
index 1cd5293ad9..b62daeeb99 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/BaseTradeSale_FieldLibrary/my_resource_title.xml
@@ -382,7 +382,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>A resource in ERP5 can be a product or a service. This term will be found in orders for instance, or accounting and inventories.</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
@@ -475,7 +475,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Resource</string> </value>
+                    <value> <string>Product or Service</string> </value>
                 </item>
                 <item>
                     <key> <string>truncate</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view/my_description.xml
index aa69165470..835776f752 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view/my_description.xml
@@ -216,7 +216,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>General description which may be printed out on official documents and read by suppliers and clients.</string> </value>
+                    <value> <string>General description of a document in ERP5. Descriptions are not supposed to be internal, and in a case of certain documents such as invoices for example, will be seen by your customers.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view/my_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view/my_quantity.xml
index 355b2f7713..d0dce934c1 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view/my_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view/my_quantity.xml
@@ -176,7 +176,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Default quantity</string> </value>
+                    <value> <string>Default Quantity of a resource in ERP5. It can be a product or it can be time quantity like hours or minutes for example. Quantity can be found in almost every business field of ERP5 and will always have this meaning, unless the term is different or precise, such as Priced Quantity for example.</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view/my_resource_title.xml
index e63fac52ed..4c94410004 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ContainerLine_view/my_resource_title.xml
@@ -310,7 +310,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>A resource in ERP5 can be a product or a service. This term will be found in orders for instance, or accounting and inventories.</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
@@ -403,7 +403,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Resource</string> </value>
+                    <value> <string>Product or Service</string> </value>
                 </item>
                 <item>
                     <key> <string>truncate</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_view/my_description.xml
index 06d4d7179d..d7c1ba4480 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Container_view/my_description.xml
@@ -216,7 +216,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>General description which may be printed out on official documents and read by suppliers and clients.</string> </value>
+                    <value> <string>General description of a document in ERP5. Descriptions are not supposed to be internal, and in a case of certain documents such as invoices for example, will be seen by your customers.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_resource_title.xml
index d1a6275a33..2ac49fca51 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_view/my_resource_title.xml
@@ -72,6 +72,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>A resource in ERP5 can be a product or a service. This term will be found in orders for instance, or accounting and inventories.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_resource_title</string> </value>
@@ -84,6 +88,10 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Product or Service</string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_viewFieldLibrary/my_int_index.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_viewFieldLibrary/my_int_index.xml
index dba7542e60..22ffcbc1ee 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_viewFieldLibrary/my_int_index.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/DeliveryCell_viewFieldLibrary/my_int_index.xml
@@ -196,7 +196,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>index used to sort document</string> </value>
+                    <value> <string>Sort Index will either give a calculation order or a sorting order of a document in a list that contains many documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
@@ -240,7 +240,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>listbox_int_index</string> </value>
+                    <value> <string>Sort Index</string> </value>
                 </item>
                 <item>
                     <key> <string>whitespace_preserve</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_description.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_description.xml
index 6943792bcf..b136901c67 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_description.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_description.xml
@@ -216,7 +216,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>General description which may be printed out on official documents and read by suppliers and clients.</string> </value>
+                    <value> <string>General description of a document in ERP5. Descriptions are not supposed to be internal, and in a case of certain documents such as invoices for example, will be seen by your customers.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_resource_title.xml
index c5dfb6c34e..931bd45039 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryCell_view/my_resource_title.xml
@@ -382,7 +382,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string></string> </value>
+                    <value> <string>A resource in ERP5 can be a product or a service. This term will be found in orders for instance, or accounting and inventories.</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
@@ -475,7 +475,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Resource</string> </value>
+                    <value> <string>Product or Service</string> </value>
                 </item>
                 <item>
                     <key> <string>truncate</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_int_index.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_int_index.xml
index b41094de55..3555e3a3a7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_int_index.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_int_index.xml
@@ -79,6 +79,10 @@
                     <key> <string>css_class</string> </key>
                     <value> <string>figure</string> </value>
                 </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>Sort Index will either give a calculation order or a sorting order of a document in a list that contains many documents.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_integer_value</string> </value>
@@ -93,7 +97,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Index</string> </value>
+                    <value> <string>Sort Index</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_reference.xml
index d3e27ac7c7..294212529a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_reference.xml
@@ -76,7 +76,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The internal reference.</string> </value>
+                    <value> <string>Reference of a document in ERP5, whatever the module considered. Exceptions to this rule can exist, and if so, terms will be described in the appropriate business field of this glossary. For example, the reference of a Payment Transaction has a specific name, as well as the Reference of Purchase and Sale Invoice Transactions. See the appropriate Glossary for further information.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_resource_title.xml
index 96c3d5831f..835a59fc1a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/InventoryLine_viewFieldLibrary/my_resource_title.xml
@@ -92,6 +92,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>A resource in ERP5 can be a product or a service. This term will be found in orders for instance, or accounting and inventories.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_relation_field</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_destination_title.xml
index 697e9faedc..964a4a580c 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_destination_title.xml
@@ -77,7 +77,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The organisation or person to whom merchandise or service is delivered over or provided to.</string> </value>
+                    <value> <string>The organisation or person who is delivered goods or services in this operation</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_int_index.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_int_index.xml
index 499031c460..3555e3a3a7 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_int_index.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_int_index.xml
@@ -81,7 +81,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>index used to sort document</string> </value>
+                    <value> <string>Sort Index will either give a calculation order or a sorting order of a document in a list that contains many documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
@@ -97,7 +97,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Index</string> </value>
+                    <value> <string>Sort Index</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml
index d89d25047a..725bd59a5b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_price.xml
@@ -92,6 +92,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>The unit price at which a product or service is traded. This price is a net price which has been applied all pricing conditions defined in supply documents.</string> </value>
+                </item>
                 <item>
                     <key> <string>enabled</string> </key>
                     <value> <int>1</int> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_reference.xml
index d3e27ac7c7..294212529a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_reference.xml
@@ -76,7 +76,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The internal reference.</string> </value>
+                    <value> <string>Reference of a document in ERP5, whatever the module considered. Exceptions to this rule can exist, and if so, terms will be described in the appropriate business field of this glossary. For example, the reference of a Payment Transaction has a specific name, as well as the Reference of Purchase and Sale Invoice Transactions. See the appropriate Glossary for further information.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_resource_title.xml
index ca95d4eb4c..038c2d0f1d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_resource_title.xml
@@ -101,7 +101,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The product or service which is traded.</string> </value>
+                    <value> <string>A resource in ERP5 can be a product or a service. This term will be found in orders for instance, or accounting and inventories.</string> </value>
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml
index 178bdec965..25d57bf06b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Order_viewAsODTStyles.xml
@@ -369,7 +369,7 @@ AAA=</string> </value>
         </table:table>\n
       </style:header>\n
       <style:footer>\n
-        <text:p text:style-name="Footer">Generated with ERP5 \xe2\x80\x93 Open Source ERP suite (www.erp5.org)</text:p>\n
+        <text:p text:style-name="Footer">Generated with ERP5 – Open Source ERP suite (www.erp5.org)</text:p>\n
       </style:footer>\n
     </style:master-page>\n
     <style:master-page style:name="Endnote" style:page-layout-name="pm2"/>\n
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml
index 81aeb0beb6..aff3a643f3 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml
@@ -369,7 +369,7 @@ AAA=</string> </value>
         </table:table>\n
       </style:header>\n
       <style:footer>\n
-        <text:p text:style-name="Footer">Generated with ERP5 \xe2\x80\x93 Open Source ERP suite (www.erp5.org)</text:p>\n
+        <text:p text:style-name="Footer">Generated with ERP5 – Open Source ERP suite (www.erp5.org)</text:p>\n
       </style:footer>\n
     </style:master-page>\n
     <style:master-page style:name="Endnote" style:page-layout-name="pm2"/>\n
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewDateWorkflowActionDialog/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewDateWorkflowActionDialog/my_comment.xml
index 1bf3a1d13e..8405f65f58 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewDateWorkflowActionDialog/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewDateWorkflowActionDialog/my_comment.xml
@@ -218,7 +218,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Comments which can be read by internal users but which, unlike description, are not printed out on official documents.</string> </value>
+                    <value> <string>Comments which can be read by internal users but unlike description, are not printed out on official documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewDateWorkflowActionDialog/my_workflow_action.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewDateWorkflowActionDialog/my_workflow_action.xml
index a72e572294..8f19a91d2b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewDateWorkflowActionDialog/my_workflow_action.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewDateWorkflowActionDialog/my_workflow_action.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_destination_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_destination_payment.xml
index e8b1ff1c6f..4b24669d6d 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_destination_payment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_destination_payment.xml
@@ -99,7 +99,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The person or organisation in charge of paying for the client.</string> </value>
+                    <value> <string>The organisation or person in charge of paying for the client.</string> </value>
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_int_index.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_int_index.xml
index a18a187c5d..51bb299e2b 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_int_index.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_int_index.xml
@@ -76,7 +76,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>index used to sort document</string> </value>
+                    <value> <string>Sort Index will either give a calculation order or a sorting order of a document in a list that contains many documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
@@ -92,7 +92,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Index</string> </value>
+                    <value> <string>Sort Index</string> </value>
                 </item>
               </dictionary>
             </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_payment_additional_term.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_payment_additional_term.xml
index fb70b5d8bd..6dfbddecdc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_payment_additional_term.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_payment_additional_term.xml
@@ -87,7 +87,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Defines an additional term for making payment after the end of the month.</string> </value>
+                    <value> <string>Defines the additional term (in days) allowed to the customer to pay his order</string> </value>
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_payment_term.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_payment_term.xml
index 6ca844a8a9..68a50c4f68 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_payment_term.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_payment_term.xml
@@ -87,7 +87,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The term (number of days) for making payment</string> </value>
+                    <value> <string>The term (days) allowed to the customer for the payment of the order</string> </value>
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_source_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_source_payment.xml
index f07d7ea077..26daed39ca 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_source_payment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PaymentCondition_viewFieldLibrary/my_source_payment.xml
@@ -99,7 +99,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The person or organisation in charge of receiving the payment for the supplier.</string> </value>
+                    <value> <string>The organisation or person in charge of receiving the payment for the supplier.</string> </value>
                 </item>
                 <item>
                     <key> <string>enabled</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_destination_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_destination_reference.xml
index 87107a7de7..42fbbf2a94 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_destination_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_destination_reference.xml
@@ -76,7 +76,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The reference for the client.</string> </value>
+                    <value> <string>The reference of the client.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_reference.xml
index 2c00d3020e..ad7d849780 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_reference.xml
@@ -77,7 +77,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The internal reference.</string> </value>
+                    <value> <string>Reference of a document in ERP5, whatever the module considered. Exceptions to this rule can exist, and if so, terms will be described in the appropriate business field of this glossary. For example, the reference of a Payment Transaction has a specific name, as well as the Reference of Purchase and Sale Invoice Transactions. See the appropriate Glossary for further information.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_source_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_source_reference.xml
index eccc7e70a5..0f43e892c4 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_source_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewFieldLibrary/my_source_reference.xml
@@ -76,7 +76,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The reference for the supplier.</string> </value>
+                    <value> <string>The reference of the supplier.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_comment.xml
index c0720d3fe7..ef4f2a6aa8 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_comment.xml
@@ -75,6 +75,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>Comments which can be read by internal users but unlike description, are not printed out on official documents.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_text_area_field</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment.xml
index 772ea831e8..d749cb8f5e 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment.xml
@@ -92,7 +92,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The person or organisation in charge of paying for the client.</string> </value>
+                    <value> <string>The organisation or person in charge of paying for the client.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment_title.xml
index f167c711ca..ebda1dc396 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_payment_title.xml
@@ -108,6 +108,10 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>The organisation or person in charge of paying for the client.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_relation_field</string> </value>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_title.xml
index 551c08ef47..13e9f1cea6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_destination_title.xml
@@ -111,7 +111,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The organisation or person to whom merchandise or service is delivered over or provided to.</string> </value>
+                    <value> <string>The organisation or person who is delivered goods or services in this operation</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_expiration_date.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_expiration_date.xml
index 35fc584318..55cf6fd584 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_expiration_date.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_expiration_date.xml
@@ -76,7 +76,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The date until which the offer is valid.</string> </value>
+                    <value> <string>The date when the document expires.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_payment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_payment.xml
index db2999c5c7..dbd154ae25 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_payment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseTradeCondition_viewFieldLibrary/my_source_payment.xml
@@ -92,7 +92,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The person or organisation in charge of receiving the payment for the supplier.</string> </value>
+                    <value> <string>The organisation or person in charge of receiving the payment for the supplier.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/my_comment.xml
index ad34fb3fac..fbd49344dc 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/my_comment.xml
@@ -216,7 +216,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Comments which can be read by internal users but which, unlike description, are not printed out on official documents.</string> </value>
+                    <value> <string>Comments which can be read by internal users but unlike description, are not printed out on official documents.</string> </value>
                 </item>
                 <item>
                     <key> <string>editable</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/my_destination_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/my_destination_title.xml
index 64f0a7362f..585e8a2ee6 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/my_destination_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/my_destination_title.xml
@@ -274,7 +274,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The organisation or person to whom merchandise or service is delivered over or provided to.</string> </value>
+                    <value> <string>The organisation or person who is delivered goods or services in this operation</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/my_title.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/my_title.xml
index bd02b27239..fa64916ae9 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/my_title.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/ReturnedSalePackingList_view/my_title.xml
@@ -200,7 +200,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>A one line title which describes a product, an order, a supply, a trade condition. It may be used  in official documents.</string> </value>
+                    <value> <string>The name of a document in ERP5</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_comment.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_comment.xml
index 20b110fbbb..facd58bc7f 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_comment.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SaleOrder_view/my_comment.xml
@@ -72,6 +72,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>description</string> </key>
+                    <value> <string>Comments which can be read by internal users but unlike description, are not printed out on official documents.</string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_comment</string> </value>
@@ -84,6 +88,10 @@
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Comments</string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Tax_viewFieldLibrary/my_quantity.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Tax_viewFieldLibrary/my_quantity.xml
index 4a734dcf03..d7142bdebb 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Tax_viewFieldLibrary/my_quantity.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Tax_viewFieldLibrary/my_quantity.xml
@@ -194,7 +194,7 @@
                 </item>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>Default quantity</string> </value>
+                    <value> <string>Default Quantity of a resource in ERP5. It can be a product or it can be time quantity like hours or minutes for example. Quantity can be found in almost every business field of ERP5 and will always have this meaning, unless the term is different or precise, such as Priced Quantity for example.</string> </value>
                 </item>
                 <item>
                     <key> <string>display_maxwidth</string> </key>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Tax_viewFieldLibrary/my_reference.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Tax_viewFieldLibrary/my_reference.xml
index d3e27ac7c7..294212529a 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Tax_viewFieldLibrary/my_reference.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Tax_viewFieldLibrary/my_reference.xml
@@ -76,7 +76,7 @@
               <dictionary>
                 <item>
                     <key> <string>description</string> </key>
-                    <value> <string>The internal reference.</string> </value>
+                    <value> <string>Reference of a document in ERP5, whatever the module considered. Exceptions to this rule can exist, and if so, terms will be described in the appropriate business field of this glossary. For example, the reference of a Payment Transaction has a specific name, as well as the Reference of Purchase and Sale Invoice Transactions. See the appropriate Glossary for further information.</string> </value>
                 </item>
                 <item>
                     <key> <string>field_id</string> </key>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index bc6a950bff..83be903e06 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-569
\ No newline at end of file
+570
\ No newline at end of file
-- 
2.30.9