From a05570c35863c519a47d8b222579834f42ce057b Mon Sep 17 00:00:00 2001
From: Yusei Tahara <yusei@nexedi.com>
Date: Mon, 18 May 2009 11:25:24 +0000
Subject: [PATCH] 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.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27023 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../listbox.xml                                | 13 +++++++++----
 .../listbox.xml                                | 13 +++++++++----
 .../AnnotationLine_view/my_source_title.xml    | 16 ++++++++++++++--
 .../my_resource_title.xml                      | 16 ++++++++++++++--
 .../my_destination_section_title.xml           | 16 ++++++++++++++--
 .../my_source_section_title.xml                | 16 ++++++++++++++--
 .../my_resource_title.xml                      | 16 ++++++++++++++--
 .../PaySheetModelLine_view/my_source_title.xml | 16 ++++++++++++++--
 .../my_destination_section_title.xml           | 16 ++++++++++++++--
 ..._insurance_annotation_line_source_title.xml | 18 +++++++++++++++---
 .../my_source_section_title.xml                | 16 ++++++++++++++--
 .../my_specialise_title_list.xml               | 16 ++++++++++++++--
 .../my_destination_section_title.xml           | 16 ++++++++++++++--
 ..._insurance_annotation_line_source_title.xml | 18 +++++++++++++++---
 .../my_source_section_title.xml                | 16 ++++++++++++++--
 .../my_specialise_title.xml                    | 18 +++++++++++++++---
 .../my_source_section_title.xml                | 18 +++++++++++++++++-
 ..._insurance_annotation_line_source_title.xml | 18 +++++++++++++++---
 bt5/erp5_payroll/bt/change_log                 |  3 +++
 bt5/erp5_payroll/bt/revision                   |  2 +-
 20 files changed, 253 insertions(+), 44 deletions(-)

diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportSection/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportSection/listbox.xml
index ae705e91dc..617218cdb7 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportSection/listbox.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportSection/listbox.xml
@@ -13,14 +13,15 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>editable_columns</string>
-                <string>stat_method</string>
                 <string>title</string>
-                <string>select</string>
-                <string>selection_name</string>
                 <string>columns</string>
                 <string>list_method</string>
+                <string>count_method</string>
+                <string>stat_method</string>
+                <string>selection_name</string>
                 <string>search</string>
+                <string>select</string>
+                <string>editable_columns</string>
               </list>
             </value>
         </item>
@@ -104,6 +105,10 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>count_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>editable_columns</string> </key>
                     <value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml
index edc96a0623..c7ff1d48e2 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml
@@ -13,14 +13,15 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>editable_columns</string>
-                <string>stat_method</string>
                 <string>title</string>
-                <string>select</string>
-                <string>selection_name</string>
                 <string>columns</string>
                 <string>list_method</string>
+                <string>count_method</string>
+                <string>stat_method</string>
+                <string>selection_name</string>
                 <string>search</string>
+                <string>select</string>
+                <string>editable_columns</string>
               </list>
             </value>
         </item>
@@ -120,6 +121,10 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>count_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>editable_columns</string> </key>
                     <value>
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 e0f6f81861..5d9b57a64c 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,11 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -109,6 +110,17 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>OrganisationModule_viewOrganisationList/listbox</string>
+                          <string>Organisations</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
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 acb11cd59a..5b3d271282 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
@@ -13,11 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -109,6 +110,17 @@
                       </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>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_destination_section_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_destination_section_title.xml
index 4659f8196d..01821d9f67 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_destination_section_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_destination_section_title.xml
@@ -13,11 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -109,6 +110,17 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>OrganisationModule_viewOrganisationList/listbox</string>
+                          <string>Organisations</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
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 a449b9341f..e23fff8b86 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,11 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -114,6 +115,17 @@ This can be the tax authority for taxes, or the employee for wages.</string> </v
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>PersonModule_viewPersonList/listbox</string>
+                          <string>Persons</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </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 acb11cd59a..5b3d271282 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
@@ -13,11 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -109,6 +110,17 @@
                       </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>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml
index e0f6f81861..5d9b57a64c 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml
@@ -13,11 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -109,6 +110,17 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>OrganisationModule_viewOrganisationList/listbox</string>
+                          <string>Organisations</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_destination_section_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_destination_section_title.xml
index 557ea9fd96..c65f2a500d 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_destination_section_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_destination_section_title.xml
@@ -13,11 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -109,6 +110,17 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>OrganisationModule_viewOrganisationList/listbox</string>
+                          <string>Organisations</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_social_insurance_annotation_line_source_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_social_insurance_annotation_line_source_title.xml
index eedb54a121..bcdf69c1f5 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_social_insurance_annotation_line_source_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_social_insurance_annotation_line_source_title.xml
@@ -13,13 +13,14 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
-                <string>relation_setter_id</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>allow_jump</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>relation_setter_id</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -115,6 +116,17 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>OrganisationModule_viewOrganisationList/listbox</string>
+                          <string>Organisations</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>relation_setter_id</string> </key>
                     <value> <string>setSocialInsuranceAnnotationLineSourceUid</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_source_section_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_source_section_title.xml
index a4e671b5c0..78a40f349b 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_source_section_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_source_section_title.xml
@@ -13,11 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -109,6 +110,17 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>PersonModule_viewPersonList/listbox</string>
+                          <string>Persons</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml
index d751d4be57..e2ee4c88a1 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml
@@ -13,11 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -109,6 +110,17 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>PaySheetModelModule_viewPaySheetModelList/listbox</string>
+                          <string>Pay Sheet Models</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_destination_section_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_destination_section_title.xml
index 557ea9fd96..c65f2a500d 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_destination_section_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_destination_section_title.xml
@@ -13,11 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -109,6 +110,17 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>OrganisationModule_viewOrganisationList/listbox</string>
+                          <string>Organisations</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_social_insurance_annotation_line_source_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_social_insurance_annotation_line_source_title.xml
index eedb54a121..bcdf69c1f5 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_social_insurance_annotation_line_source_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_social_insurance_annotation_line_source_title.xml
@@ -13,13 +13,14 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
-                <string>relation_setter_id</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>allow_jump</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>relation_setter_id</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -115,6 +116,17 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>OrganisationModule_viewOrganisationList/listbox</string>
+                          <string>Organisations</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>relation_setter_id</string> </key>
                     <value> <string>setSocialInsuranceAnnotationLineSourceUid</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_source_section_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_source_section_title.xml
index a4e671b5c0..78a40f349b 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_source_section_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_source_section_title.xml
@@ -13,11 +13,12 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -109,6 +110,17 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>PersonModule_viewPersonList/listbox</string>
+                          <string>Persons</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_specialise_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_specialise_title.xml
index a8aca34428..2dceb02f45 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_specialise_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_specialise_title.xml
@@ -13,12 +13,13 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
-                <string>relation_setter_id</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>relation_setter_id</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -110,6 +111,17 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>PaySheetModelModule_viewPaySheetModelList/listbox</string>
+                          <string>Pay Sheet Models</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>relation_setter_id</string> </key>
                     <value> <string>PaySheetTransaction_setSpecialiseAndApplyModel</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_source_section_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_source_section_title.xml
index d47339b6ed..989854372e 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_source_section_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_source_section_title.xml
@@ -14,9 +14,10 @@
             <value>
               <list>
                 <string>title</string>
-                <string>columns</string>
                 <string>portal_type</string>
+                <string>columns</string>
                 <string>parameter_list</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -138,6 +139,21 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>OrganisationModule_viewOrganisationList/listbox</string>
+                          <string>Organisations</string>
+                        </tuple>
+                        <tuple>
+                          <string>PersonModule_viewPersonList/listbox</string>
+                          <string>Persons</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_social_insurance_annotation_line_source_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_social_insurance_annotation_line_source_title.xml
index eedb54a121..bcdf69c1f5 100644
--- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_social_insurance_annotation_line_source_title.xml
+++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_social_insurance_annotation_line_source_title.xml
@@ -13,13 +13,14 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
-                <string>catalog_index</string>
                 <string>title</string>
-                <string>relation_setter_id</string>
                 <string>description</string>
-                <string>portal_type</string>
                 <string>allow_jump</string>
                 <string>base_category</string>
+                <string>portal_type</string>
+                <string>catalog_index</string>
+                <string>relation_setter_id</string>
+                <string>proxy_listbox_ids</string>
               </list>
             </value>
         </item>
@@ -115,6 +116,17 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>proxy_listbox_ids</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>OrganisationModule_viewOrganisationList/listbox</string>
+                          <string>Organisations</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
                 <item>
                     <key> <string>relation_setter_id</string> </key>
                     <value> <string>setSocialInsuranceAnnotationLineSourceUid</string> </value>
diff --git a/bt5/erp5_payroll/bt/change_log b/bt5/erp5_payroll/bt/change_log
index a2ada9c47c..e0c1ba0b02 100644
--- a/bt5/erp5_payroll/bt/change_log
+++ b/bt5/erp5_payroll/bt/change_log
@@ -1,3 +1,6 @@
+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.
+
 2009-05-11 yusei
 * Bump up the version.
 * Simplify field libraries and proxy fields. Old field libraries are kept for backward compatibility.
diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision
index cdf1f34dc9..57db2e9786 100644
--- a/bt5/erp5_payroll/bt/revision
+++ b/bt5/erp5_payroll/bt/revision
@@ -1 +1 @@
-403
\ No newline at end of file
+404
\ No newline at end of file
-- 
2.30.9