diff --git a/bt5/erp5_payroll/ActionTemplateItem/portal_types/System%20Preference/payroll_preference.xml b/bt5/erp5_payroll/ActionTemplateItem/portal_types/System%20Preference/payroll_preference.xml
new file mode 100644
index 0000000000000000000000000000000000000000..21ae6908e7a8b6ab33d8e04ec5f64c665dc39675
--- /dev/null
+++ b/bt5/erp5_payroll/ActionTemplateItem/portal_types/System%20Preference/payroll_preference.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>action</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>category</string> </key>
+ <value> <string>object_view</string> </value>
+ </item>
+ <item>
+ <key> <string>condition</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>icon</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>payroll_preference</string> </value>
+ </item>
+ <item>
+ <key> <string>permissions</string> </key>
+ <value>
+ <tuple>
+ <string>View</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>priority</string> </key>
+ <value> <float>8.0</float> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Payroll</string> </value>
+ </item>
+ <item>
+ <key> <string>visible</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>text</string> </key>
+ <value> <string>string:${object_url}/SystemPreference_viewPayroll</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_payroll/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml b/bt5/erp5_payroll/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
index dbac4501f28b0a39549086ea196f8160ffd9f743..8977ef07c908effee58aeae1d0741d2bf5b86d1a 100644
--- a/bt5/erp5_payroll/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
+++ b/bt5/erp5_payroll/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
@@ -32,9 +32,6 @@
<item>Pay Sheet Model Ratio Line</item>
<item>Payment Condition</item>
</portal_type>
- <portal_type id="Payroll Service Module">
- <item>Payroll Service</item>
- </portal_type>
<portal_type id="Preference">
<item>Pay Sheet Transaction</item>
</portal_type>
diff --git a/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml b/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
index 583b9608f1d0683c084c77c8cc3d89b433321584..81bed1df58f94bd1201b14ed990c1a057beeecf9 100644
--- a/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
+++ b/bt5/erp5_payroll/PortalTypeBaseCategoryTemplateItem/base_category_list.xml
@@ -26,10 +26,7 @@
<item>quantity_unit</item>
<item>specialise</item>
</portal_type>
- <portal_type id="Payroll Service">
+ <portal_type id="Service">
<item>base_amount</item>
</portal_type>
- <portal_type id="Payroll Service Module">
- <item>business_application</item>
- </portal_type>
</base_category_list>
\ No newline at end of file
diff --git a/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Employment%20Contract%20Module.xml b/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Employment%20Contract%20Module.xml
index 4be113813a331dca4a170149c80b27d1020c8bcc..68ba465b243cb6f8374e3cf22c534146c26a11b9 100644
--- a/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Employment%20Contract%20Module.xml
+++ b/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Employment%20Contract%20Module.xml
@@ -92,7 +92,7 @@
An ERP5 Binder document class will eventually be defined\n
in order to implement a binder of documents which can itself\n
be categorized.\n
- </string> </value>
+</string> </value>
</item>
<item>
<key> <string>factory</string> </key>
diff --git a/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml b/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
index c9486ebb1729f712af974f432faa3feca370778f..63790d5438b5344ad9f7d44b4bb8cd2d1fddeb44 100644
--- a/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
+++ b/bt5/erp5_payroll/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
@@ -5,15 +5,15 @@
</chain>
<chain>
<type>Pay Sheet Cell</type>
- <workflow>edit_workflow, delivery_movement_causality_interaction_workflow, delivery_movement_simulation_interaction_workflow</workflow>
+ <workflow>edit_workflow, delivery_movement_simulation_interaction_workflow, delivery_movement_causality_interaction_workflow</workflow>
</chain>
<chain>
<type>Pay Sheet Line</type>
- <workflow>edit_workflow, delivery_movement_simulation_interaction_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow</workflow>
+ <workflow>delivery_movement_simulation_interaction_workflow, edit_workflow, trade_matrix_workflow, delivery_movement_causality_interaction_workflow</workflow>
</chain>
<chain>
<type>Pay Sheet Model</type>
- <workflow>paysheet_model_interaction_workflow, validation_workflow, edit_workflow</workflow>
+ <workflow>edit_workflow, paysheet_model_interaction_workflow, validation_workflow</workflow>
</chain>
<chain>
<type>Pay Sheet Model Line</type>
@@ -21,14 +21,10 @@
</chain>
<chain>
<type>Pay Sheet Transaction</type>
- <workflow>delivery_causality_interaction_workflow, delivery_simulation_interaction_workflow, delivery_causality_workflow, edit_workflow, accounting_workflow</workflow>
+ <workflow>delivery_causality_interaction_workflow, edit_workflow, delivery_simulation_interaction_workflow, accounting_workflow, delivery_causality_workflow</workflow>
</chain>
<chain>
<type>Pay Sheet Transaction Line</type>
- <workflow>delivery_movement_simulation_interaction_workflow, delivery_movement_causality_interaction_workflow, edit_workflow</workflow>
- </chain>
- <chain>
- <type>Payroll Service</type>
- <workflow>edit_workflow, validation_workflow</workflow>
+ <workflow>delivery_movement_causality_interaction_workflow, edit_workflow, delivery_movement_simulation_interaction_workflow</workflow>
</chain>
</workflow_chain>
\ No newline at end of file
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_mirror_section.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_mirror_section.xml
index 3bcd557e63043cec8b4ac214f161d75e85fef796..7b3e8f91f8fc193bd6edf37957e3917fb0449d15 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_mirror_section.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_mirror_section.xml
@@ -13,9 +13,9 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
<string>default</string>
<string>items</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -88,6 +88,10 @@
<key> <string>values</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_list_field</string> </value>
@@ -96,13 +100,19 @@
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Payroll Service Provider</string> </value>
+ <value> <string>Service Provider</string> </value>
</item>
</dictionary>
</value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_resource.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_resource.xml
index 43cdd6976a2105211864f5b5a9e4ed52a2baf24d..745f65da2d3f46a687c450680b0a57c757e96724 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_resource.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReport/your_resource.xml
@@ -13,11 +13,10 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
- <string>required</string>
- <string>editable</string>
<string>default</string>
+ <string>editable</string>
<string>items</string>
+ <string>required</string>
</list>
</value>
</item>
@@ -90,17 +89,27 @@
<key> <string>values</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_list_field</string> </value>
+ <value> <string>my_resource_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ <value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
</item>
<item>
<key> <string>required</string> </key>
@@ -110,10 +119,6 @@
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Payroll Service</string> </value>
- </item>
</dictionary>
</value>
</item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_mirror_section.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_mirror_section.xml
index c8c7e5569f19f3121039385c5fd09eca104e6f0b..0ce648b6e8e319ed47d54cc0456d62f9daae4fdf 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_mirror_section.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_mirror_section.xml
@@ -13,8 +13,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
<string>items</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -89,13 +89,19 @@
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value>
</item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Payroll Service Provider</string> </value>
+ <value> <string>Service Provider</string> </value>
</item>
</dictionary>
</value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_resource.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_resource.xml
index a3b039321250f00b5a3fa256a6743ecc3c104a48..6709a509639c4eeee52f8b418003218e27f010d0 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_resource.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportDialog/your_resource.xml
@@ -13,9 +13,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
- <string>required</string>
<string>items</string>
+ <string>required</string>
</list>
</value>
</item>
@@ -84,11 +83,17 @@
<dictionary>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_list_field</string> </value>
+ <value> <string>my_resource_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ <value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
</item>
<item>
<key> <string>required</string> </key>
@@ -98,10 +103,6 @@
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Payroll Service</string> </value>
- </item>
</dictionary>
</value>
</item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_resource_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_resource_title.xml
index c47cc560c2321bdba3c2e929dcd6ad09df3e27ef..b4cf763949a196363b343bb0ddeb04af472e237d 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_resource_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_resource_title.xml
@@ -13,9 +13,6 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
- <string>portal_type</string>
- <string>items</string>
<string>enabled</string>
</list>
</value>
@@ -72,12 +69,6 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
- <item>
- <key> <string>items</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
- </item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
@@ -90,32 +81,21 @@
<value>
<dictionary>
<item>
- <key> <string>field_id</string> </key>
- <value> <string>my_relation_field</string> </value>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
</item>
<item>
- <key> <string>form_id</string> </key>
- <value> <string>Base_viewPayrollFieldLibrary</string> </value>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_resource_title</string> </value>
</item>
<item>
- <key> <string>portal_type</string> </key>
- <value>
- <list>
- <tuple>
- <string>Payroll Service</string>
- <string>Payroll Service</string>
- </tuple>
- </list>
- </value>
+ <key> <string>form_id</string> </key>
+ <value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Resource</string> </value>
- </item>
</dictionary>
</value>
</item>
@@ -138,20 +118,4 @@
</dictionary>
</pickle>
</record>
- <record id="3" aka="AAAAAAAAAAM=">
- <pickle>
- <tuple>
- <global name="TALESMethod" module="Products.Formulator.TALESField"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>REQUEST/relation_item_list</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
</ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_source_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_source_title.xml
index 5d9b57a64c7e0518274d8c08086b38e379f9c7fd..7a823818def768e263179104a5a7a41c0ab6c8c9 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_source_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_source_title.xml
@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
- <string>description</string>
<string>base_category</string>
- <string>portal_type</string>
<string>catalog_index</string>
+ <string>description</string>
+ <string>portal_type</string>
<string>proxy_listbox_ids</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -127,7 +127,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Payroll Service Provider</string> </value>
+ <value> <string>Service Provider</string> </value>
</item>
</dictionary>
</value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_viewFieldLibrary/my_resource_title.xml
index de36923f7d4d79d4c9de48ee5c67d4dfc5a63334..234369cfcdb3ee92e79f71336ab3365544d87465 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_viewFieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_viewFieldLibrary/my_resource_title.xml
@@ -12,11 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>allow_jump</string>
- <string>portal_type</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -76,10 +72,6 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>allow_jump</string> </key>
- <value> <int>1</int> </value>
- </item>
<item>
<key> <string>default_module</string> </key>
<value> <string>service</string> </value>
@@ -102,23 +94,12 @@
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>DeliveryCell_viewFieldLibrary</string> </value>
+ <value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>not_viewable</string> </key>
<value> <int>0</int> </value>
</item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <list>
- <tuple>
- <string>Payroll Service</string>
- <string>Payroll Service</string>
- </tuple>
- </list>
- </value>
- </item>
<item>
<key> <string>read_only</string> </key>
<value> <int>0</int> </value>
@@ -127,10 +108,6 @@
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Resource</string> </value>
- </item>
<item>
<key> <string>viewable_permission</string> </key>
<value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_viewFieldLibrary/my_source_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_viewFieldLibrary/my_source_title.xml
index 83a57f2c51729a67c0e03bce3de9de2a91f9554a..55aa7a086ccd14f51176ba947ab79cc808b0cf54 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_viewFieldLibrary/my_source_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_viewFieldLibrary/my_source_title.xml
@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
- <string>description</string>
<string>base_category</string>
- <string>portal_type</string>
<string>catalog_index</string>
+ <string>description</string>
+ <string>portal_type</string>
<string>proxy_listbox_ids</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -151,7 +151,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Payroll Service Provider</string> </value>
+ <value> <string>Service Provider</string> </value>
</item>
<item>
<key> <string>viewable_permission</string> </key>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_resource_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_resource_title.xml
index 5b3d271282ec6224c4c7da4104a93774c1ddcafc..7f8019ef0836afce63acf55b2df0984b51d89259 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_resource_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_resource_title.xml
@@ -12,14 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>description</string>
- <string>base_category</string>
- <string>portal_type</string>
- <string>catalog_index</string>
- <string>proxy_listbox_ids</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -79,56 +72,18 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>base_category</string> </key>
- <value> <string>resource</string> </value>
- </item>
- <item>
- <key> <string>catalog_index</string> </key>
- <value> <string>title</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string>The Payroll Service used.</string> </value>
- </item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_relation_field</string> </value>
+ <value> <string>my_resource_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewPayrollFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <list>
- <tuple>
- <string>Payroll Service</string>
- <string>Payroll Service</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
- <key> <string>proxy_listbox_ids</string> </key>
- <value>
- <list>
- <tuple>
- <string>PayrollServiceModule_viewPayrollServiceList/listbox</string>
- <string>Payroll Services</string>
- </tuple>
- </list>
- </value>
+ <value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Payroll Service</string> </value>
- </item>
</dictionary>
</value>
</item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_resource_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_resource_title.xml
index 10692c044816d02d39257fd8aac19d9d25860460..7f8019ef0836afce63acf55b2df0984b51d89259 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_resource_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_resource_title.xml
@@ -12,13 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>catalog_index</string>
- <string>title</string>
- <string>display_width</string>
- <string>portal_type</string>
- <string>base_category</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -78,45 +72,18 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>base_category</string> </key>
- <value> <string>resource</string> </value>
- </item>
- <item>
- <key> <string>catalog_index</string> </key>
- <value> <string>title</string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <int>35</int> </value>
- </item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_relation_field</string> </value>
+ <value> <string>my_resource_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewPayrollFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <list>
- <tuple>
- <string>Payroll Service</string>
- <string>Payroll Service</string>
- </tuple>
- </list>
- </value>
+ <value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Payroll Service</string> </value>
- </item>
</dictionary>
</value>
</item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_source_section_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_source_section_title.xml
index e23fff8b86ebab70da91bac6028e9e1a038de787..9aca7c98e00344e659e9f186854dbf40c68c8e95 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_source_section_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_source_section_title.xml
@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
- <string>description</string>
<string>base_category</string>
- <string>portal_type</string>
<string>catalog_index</string>
+ <string>description</string>
+ <string>portal_type</string>
<string>proxy_listbox_ids</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -132,7 +132,7 @@ This can be the tax authority for taxes, or the employee for wages.</string> </v
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Payroll Service Provider</string> </value>
+ <value> <string>Service Provider</string> </value>
</item>
</dictionary>
</value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_resource_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_resource_title.xml
index 5b3d271282ec6224c4c7da4104a93774c1ddcafc..7f8019ef0836afce63acf55b2df0984b51d89259 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_resource_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_resource_title.xml
@@ -12,14 +12,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
- <list>
- <string>title</string>
- <string>description</string>
- <string>base_category</string>
- <string>portal_type</string>
- <string>catalog_index</string>
- <string>proxy_listbox_ids</string>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -79,56 +72,18 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>base_category</string> </key>
- <value> <string>resource</string> </value>
- </item>
- <item>
- <key> <string>catalog_index</string> </key>
- <value> <string>title</string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string>The Payroll Service used.</string> </value>
- </item>
<item>
<key> <string>field_id</string> </key>
- <value> <string>my_relation_field</string> </value>
+ <value> <string>my_resource_title</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
- <value> <string>Base_viewPayrollFieldLibrary</string> </value>
- </item>
- <item>
- <key> <string>portal_type</string> </key>
- <value>
- <list>
- <tuple>
- <string>Payroll Service</string>
- <string>Payroll Service</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
- <key> <string>proxy_listbox_ids</string> </key>
- <value>
- <list>
- <tuple>
- <string>PayrollServiceModule_viewPayrollServiceList/listbox</string>
- <string>Payroll Services</string>
- </tuple>
- </list>
- </value>
+ <value> <string>PaySheetTransaction_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
</item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Payroll Service</string> </value>
- </item>
</dictionary>
</value>
</item>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml
index 643f1a1d23801483213c0cacf31df6d7fa577feb..f9f002abd1c374ac00c02aead9d8e52266bbd9fe 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml
@@ -97,7 +97,7 @@
</tuple>
<tuple>
<string>resource_title</string>
- <string>Payroll Service</string>
+ <string>Service</string>
</tuple>
<tuple>
<string>calculation_script_id</string>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml
index 3b00dd939f6445b7d1a9d48a1ba8fa06b74d61c2..dd6466dbda89f127e9cc4b5c3f27bc56ae859773 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getEditableObjectLineList.xml
@@ -116,7 +116,7 @@ for model_line in model_line_list:\n
model_line.getBaseApplicationTitleList()]\n
base_name = \'+\'.join(base_list)\n
\n
- payroll_service = model_line.getResourceValue()\n
+ service = model_line.getResourceValue()\n
base_contribution_list = model_line.getBaseContributionList()\n
\n
price = cell.getPrice()\n
@@ -158,7 +158,7 @@ for model_line in model_line_list:\n
\'model_line\': model_line.getRelativeUrl(),\n
\'base_contribution_list\':base_contribution_list,\n
\'base_application_list\': base_application_list,\n
- \'service_id\':payroll_service.getId()}\n
+ \'service_id\':service.getId()}\n
object_dict[salary_range].update(share_dict)\n
\n
# if the slice already exists, just update the share\n
@@ -289,7 +289,7 @@ return line_list\n
<string>base_application</string>
<string>base_list</string>
<string>base_name</string>
- <string>payroll_service</string>
+ <string>service</string>
<string>base_contribution_list</string>
<string>price</string>
<string>_write_</string>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml
index 6c85516efcc64d3c3bdd3c14e8a036bb66f19bd2..d2c5203848c8105a2fa5d33c48ed27e013692605 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml
@@ -86,7 +86,7 @@ for line in line_list:\n
\'group\' : line.getSourceSectionTitle(),\n
\'source_section_title\': line.getSourceSectionTitle(),\n
\'title\' : line.getTitle(),\n
- \'payroll_service\' : getattr(line, \'payroll_service\', None),\n
+ \'service\' : getattr(line, \'service\', None),\n
\'employer_share_total_price\' : getattr(line, \'employer_share_total_price\', None),\n
\'employee_share_total_price\' : getattr(line, \'employee_share_total_price\', None),\n
}\n
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxColumnList.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxColumnList.xml
index bf5fd46a0edb42032e00d2749fe6d5b983a2a1e1..c41c1499b69eb43af63965b437c64798564dbec6 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxColumnList.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getListBoxColumnList.xml
@@ -66,7 +66,7 @@ editable_column_list = [(\'base\', \'Base\'),]\n
\n
not_editable_column_list = [(\'int_index\', \'PaySheet Order\'),\n
(\'title\', \'Title\'),\n
- (\'source_section_title\', \'Payroll Service Provider\'),\n
+ (\'source_section_title\', \'Service Provider\'),\n
(\'slice\', \'Slice\'),]\n
\n
if not editable:\n
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
index 5e4c1391521ebe9b3fad48c7f12a4c8dab87ffd9..feb6d30d2651b2ff540157f049c412d1c020407b 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml
@@ -56,7 +56,7 @@
<value> <string>\'\'\'\n
This script return a Pay Sheet Line list with some new parameters on\n
each Pay Sheet Line (like base, base_name, base_contribution_list,\n
- payroll_service,...)\n
+ service,...)\n
It\'s used in the PaySheetTransaction_view to display PaySheetLines\n
\'\'\'\n
\n
@@ -80,7 +80,7 @@ for paysheet_line in paysheet_line_list:\n
base_application_list = paysheet_line.getBaseApplicationTitleList()\n
translated_base_application_list = [str(translateString(x)) for x in base_application_list]\n
base_application_list = \', \'.join(translated_base_application_list)\n
- payroll_service = paysheet_line.getResourceValue(portal_type=\'Payroll Service\')\n
+ service = paysheet_line.getResourceValue(portal_type=\'Service\')\n
base_contribution_list = paysheet_line.getBaseContributionList()\n
causality = paysheet_line.getCausality()\n
\n
@@ -104,8 +104,8 @@ for paysheet_line in paysheet_line_list:\n
\'base\':paysheet_line.getTotalPrice(),\n
\'base_contribution_list\':base_contribution_list,\n
\'base_application_list\': base_application_list,\n
- \'payroll_service\': payroll_service is not None and\\\n
- payroll_service.getId() or \'\',\n
+ \'service\': service is not None and\\\n
+ service.getId() or \'\',\n
\'causality\': causality,}\n
line_list.append(paysheet_line.asContext(**params))\n
continue\n
@@ -147,8 +147,8 @@ for paysheet_line in paysheet_line_list:\n
\'base\':base,\n
\'base_contribution_list\':base_contribution_list,\n
\'base_application_list\': base_application_list,\n
- \'payroll_service\': payroll_service is not None and\\\n
- payroll_service.getId() or \'\',\n
+ \'service\': service is not None and\\\n
+ service.getId() or \'\',\n
\'causality\': causality,}\n
object_dict[slice].update(share_dict)\n
else:\n
@@ -254,7 +254,7 @@ return line_list\n
<string>x</string>
<string>str</string>
<string>translated_base_application_list</string>
- <string>payroll_service</string>
+ <string>service</string>
<string>base_contribution_list</string>
<string>causality</string>
<string>base_application</string>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml
index a9bc1ac1e8becdbea091a1f416c02af16743b1b8..5edd129becc0b94e27cdec6d8035308e528172ae 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml
@@ -114,7 +114,7 @@
</tuple>
<tuple>
<string>source_section_title</string>
- <string>Payroll Service Provider</string>
+ <string>Service Provider</string>
</tuple>
</list>
</value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox.xml
index 5f996fba0df538887e5bd1110cf53aaa029237d9..1092ad0963266c1206e8cec7f413133558597af1 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox.xml
@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>editable_columns</string>
- <string>title</string>
- <string>selection_name</string>
<string>columns</string>
<string>description</string>
+ <string>editable_columns</string>
<string>portal_types</string>
+ <string>selection_name</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -97,7 +97,7 @@
</tuple>
<tuple>
<string>source_title</string>
- <string>Payroll Service Provider</string>
+ <string>Service Provider</string>
</tuple>
<tuple>
<string>quantity</string>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewFieldLibrary/my_resource_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewFieldLibrary/my_resource_title.xml
index cae3d5e21add2ab6ddb9a1169bc64a4a7eaf3dde..e94ad155cad33116322f32d1343329b8ca570e10 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewFieldLibrary/my_resource_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewFieldLibrary/my_resource_title.xml
@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
+ <string>catalog_index</string>
<string>description</string>
- <string>base_category</string>
+ <string>parameter_list</string>
<string>portal_type</string>
- <string>catalog_index</string>
<string>proxy_listbox_ids</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -60,6 +60,14 @@
<key> <string>tales</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>catalog_index</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>field_id</string> </key>
<value> <string></string> </value>
@@ -68,10 +76,28 @@
<key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>parameter_list</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>portal_type</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>proxy_listbox_ids</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
</dictionary>
</value>
</item>
@@ -79,10 +105,6 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>base_category</string> </key>
- <value> <string>resource</string> </value>
- </item>
<item>
<key> <string>catalog_index</string> </key>
<value> <string>title</string> </value>
@@ -93,7 +115,7 @@
</item>
<item>
<key> <string>description</string> </key>
- <value> <string>The Payroll Service used.</string> </value>
+ <value> <string>The Service used.</string> </value>
</item>
<item>
<key> <string>editable_permission</string> </key>
@@ -119,13 +141,19 @@
<key> <string>not_viewable</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>parameter_list</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
- <string>Payroll Service</string>
- <string>Payroll Service</string>
+ <string>Service</string>
+ <string>Service</string>
</tuple>
</list>
</value>
@@ -135,8 +163,8 @@
<value>
<list>
<tuple>
- <string>PayrollServiceModule_viewPayrollServiceList/listbox</string>
- <string>Payroll Services</string>
+ <string>ServiceModule_viewServiceList/listbox</string>
+ <string>Services</string>
</tuple>
</list>
</value>
@@ -151,7 +179,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Payroll Service</string> </value>
+ <value> <string>Service</string> </value>
</item>
<item>
<key> <string>viewable_permission</string> </key>
@@ -171,4 +199,20 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: [(\'use_uid\', [here.portal_categories.resolveCategory(x).getUid() for x in here.portal_preferences.getPreferredPayrollResourceUseCategoryList()])]</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SystemPreference_viewPayroll.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SystemPreference_viewPayroll.xml
new file mode 100644
index 0000000000000000000000000000000000000000..216f42bc0ce4da94b68f7f6b416f77aa9892fe36
--- /dev/null
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SystemPreference_viewPayroll.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_objects</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>action</string> </key>
+ <value> <string>Base_edit</string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>edit_order</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>encoding</string> </key>
+ <value> <string>UTF-8</string> </value>
+ </item>
+ <item>
+ <key> <string>enctype</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>group_list</string> </key>
+ <value>
+ <list>
+ <string>left</string>
+ <string>right</string>
+ <string>center</string>
+ <string>bottom</string>
+ <string>hidden</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>groups</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>bottom</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>center</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>left</string> </key>
+ <value>
+ <list>
+ <string>my_preferred_payroll_resource_use_category_list</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>right</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>SystemPreference_viewPayroll</string> </value>
+ </item>
+ <item>
+ <key> <string>method</string> </key>
+ <value> <string>POST</string> </value>
+ </item>
+ <item>
+ <key> <string>name</string> </key>
+ <value> <string>SystemPreference_viewBPM</string> </value>
+ </item>
+ <item>
+ <key> <string>pt</string> </key>
+ <value> <string>form_view</string> </value>
+ </item>
+ <item>
+ <key> <string>row_length</string> </key>
+ <value> <int>4</int> </value>
+ </item>
+ <item>
+ <key> <string>stored_encoding</string> </key>
+ <value> <string>UTF-8</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>BPM</string> </value>
+ </item>
+ <item>
+ <key> <string>unicode_mode</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>update_action</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SystemPreference_viewPayroll/my_preferred_payroll_resource_use_category_list.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SystemPreference_viewPayroll/my_preferred_payroll_resource_use_category_list.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5853f9b3e9ba0af4bb001bf17b146cb4ec1c4d84
--- /dev/null
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/SystemPreference_viewPayroll/my_preferred_payroll_resource_use_category_list.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>items</string>
+ <string>title</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_preferred_payroll_resource_use_category_list</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_multi_list_field</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>items</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Payroll Resource Use Categories</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: getattr(here.portal_categories.use, preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\', base=1)</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log
index e0c1ba0b02700c0695cd0095912a8c57ad8a61b7..e8ac96e93857d986e0d0cfec2adda34a5293d5ff 100644
--- a/bt5/erp5_payroll/bt/change_log
+++ b/bt5/erp5_payroll/bt/change_log
@@ -1,3 +1,6 @@
+2009-06-10 fabien
+* Payroll Service is now replaced by Service
+
2009-05-18 yusei
* Fix some proxy fields. count_method should not be inherited from template field and proxy_listbox_ids had to be copied to new proxified fields but it was not copied.
diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision
index 812799aa82ed573e25002889181db700932e62c9..c95da112f9eac2c30e51543dea8ec04ab0e435a9 100644
--- a/bt5/erp5_payroll/bt/revision
+++ b/bt5/erp5_payroll/bt/revision
@@ -1 +1 @@
-452
\ No newline at end of file
+459
\ No newline at end of file
diff --git a/bt5/erp5_payroll/bt/template_action_path_list b/bt5/erp5_payroll/bt/template_action_path_list
index cfb1806fa7402e837e0757077b95844854e9a954..bda3a8f8554d9e32d8a30faa766b6d56e4f84cc7 100644
--- a/bt5/erp5_payroll/bt/template_action_path_list
+++ b/bt5/erp5_payroll/bt/template_action_path_list
@@ -29,5 +29,4 @@ Pay Sheet Transaction | view
Pay Sheet Transaction | view_payment
Pay Sheet Transaction | view_profile
Pay Sheet Transaction | view_ratio_settings
-Payroll Service Module | view
-Payroll Service | view
\ No newline at end of file
+System Preference | payroll_preference
\ No newline at end of file
diff --git a/bt5/erp5_payroll/bt/template_module_id_list b/bt5/erp5_payroll/bt/template_module_id_list
index cdfc6d10156037ceccc55d38802d96dcbd9ab81f..8bb840a44fb874f394810c4945b34e7091c44075 100644
--- a/bt5/erp5_payroll/bt/template_module_id_list
+++ b/bt5/erp5_payroll/bt/template_module_id_list
@@ -1,2 +1 @@
-payroll_service_module
paysheet_model_module
\ No newline at end of file
diff --git a/bt5/erp5_payroll/bt/template_portal_type_allowed_content_type_list b/bt5/erp5_payroll/bt/template_portal_type_allowed_content_type_list
index 6f2f666f47c5a4fde9df51f3f33fcebcdf1318e6..d726e395c370d0a4b9904ffdc7e08548605e0621 100644
--- a/bt5/erp5_payroll/bt/template_portal_type_allowed_content_type_list
+++ b/bt5/erp5_payroll/bt/template_portal_type_allowed_content_type_list
@@ -15,5 +15,4 @@ Pay Sheet Transaction | Pay Sheet Model Line
Pay Sheet Transaction | Pay Sheet Model Ratio Line
Pay Sheet Transaction | Pay Sheet Transaction Line
Pay Sheet Transaction | Payment Condition
-Payroll Service Module | Payroll Service
Preference | Pay Sheet Transaction
\ No newline at end of file
diff --git a/bt5/erp5_payroll/bt/template_portal_type_base_category_list b/bt5/erp5_payroll/bt/template_portal_type_base_category_list
index 4cbc151d2912d058e9861997ee16c11b6ea02588..5f06146791329116c049650a9f102674c2628fcd 100644
--- a/bt5/erp5_payroll/bt/template_portal_type_base_category_list
+++ b/bt5/erp5_payroll/bt/template_portal_type_base_category_list
@@ -13,5 +13,4 @@ Pay Sheet Model Slice | salary_range
Pay Sheet Model Slice | tax_category
Pay Sheet Transaction | quantity_unit
Pay Sheet Transaction | specialise
-Payroll Service Module | business_application
-Payroll Service | base_amount
\ No newline at end of file
+Service | base_amount
\ No newline at end of file
diff --git a/bt5/erp5_payroll/bt/template_portal_type_id_list b/bt5/erp5_payroll/bt/template_portal_type_id_list
index b7f56bbee37ee7cffbdcedd18818265e4affd1bb..9c728e129ef4b9ed968554ca21776cdc37ffb980 100644
--- a/bt5/erp5_payroll/bt/template_portal_type_id_list
+++ b/bt5/erp5_payroll/bt/template_portal_type_id_list
@@ -10,6 +10,4 @@ Pay Sheet Model Module
Pay Sheet Model Ratio Line
Pay Sheet Model Slice
Pay Sheet Transaction
-Pay Sheet Transaction Line
-Payroll Service
-Payroll Service Module
\ No newline at end of file
+Pay Sheet Transaction Line
\ No newline at end of file
diff --git a/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list b/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list
index 335149b46d753d6024626e87816d1540cff21ffe..97aea95735f636744e463c9a0ec36df2884fe8e4 100644
--- a/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list
+++ b/bt5/erp5_payroll/bt/template_portal_type_workflow_chain_list
@@ -18,6 +18,4 @@ Pay Sheet Transaction | accounting_workflow
Pay Sheet Transaction | delivery_causality_interaction_workflow
Pay Sheet Transaction | delivery_causality_workflow
Pay Sheet Transaction | delivery_simulation_interaction_workflow
-Pay Sheet Transaction | edit_workflow
-Payroll Service | edit_workflow
-Payroll Service | validation_workflow
\ No newline at end of file
+Pay Sheet Transaction | edit_workflow
\ No newline at end of file