[Erp5-report] r27023 - in /erp5/trunk/bt5/erp5_payroll: SkinTemplateItem/portal_skins/erp5_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon May 18 13:25:26 CEST 2009
Author: yusei
Date: Mon May 18 13:25:24 2009
New Revision: 27023
URL: http://svn.erp5.org?rev=27023&view=rev
Log:
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.
Modified:
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportSection/listbox.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_source_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_resource_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_destination_section_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_source_section_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_resource_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_destination_section_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_social_insurance_annotation_line_source_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_source_section_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_destination_section_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_social_insurance_annotation_line_source_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_source_section_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_specialise_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_source_section_title.xml
erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_social_insurance_annotation_line_source_title.xml
erp5/trunk/bt5/erp5_payroll/bt/change_log
erp5/trunk/bt5/erp5_payroll/bt/revision
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportSection/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportSection/listbox.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportSection/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportSection/listbox.xml [utf8] Mon May 18 13:25:24 2009
@@ -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>
@@ -103,6 +104,10 @@
</tuple>
</list>
</value>
+ </item>
+ <item>
+ <key> <string>count_method</string> </key>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>editable_columns</string> </key>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml [utf8] Mon May 18 13:25:24 2009
@@ -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>
@@ -119,6 +120,10 @@
</tuple>
</list>
</value>
+ </item>
+ <item>
+ <key> <string>count_method</string> </key>
+ <value> <string></string> </value>
</item>
<item>
<key> <string>editable_columns</string> </key>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_source_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_source_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_source_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_source_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>catalog_index</string>
<string>title</string>
<string>description</string>
+ <string>base_category</string>
<string>portal_type</string>
- <string>base_category</string>
+ <string>catalog_index</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -110,6 +111,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_resource_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_resource_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_resource_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_resource_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>catalog_index</string>
<string>title</string>
<string>description</string>
+ <string>base_category</string>
<string>portal_type</string>
- <string>base_category</string>
+ <string>catalog_index</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -110,6 +111,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_destination_section_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_destination_section_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_destination_section_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_destination_section_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>catalog_index</string>
<string>title</string>
<string>description</string>
+ <string>base_category</string>
<string>portal_type</string>
- <string>base_category</string>
+ <string>catalog_index</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -110,6 +111,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_source_section_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_source_section_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_source_section_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_source_section_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>catalog_index</string>
<string>title</string>
<string>description</string>
+ <string>base_category</string>
<string>portal_type</string>
- <string>base_category</string>
+ <string>catalog_index</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -115,6 +116,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_resource_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_resource_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_resource_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_resource_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>catalog_index</string>
<string>title</string>
<string>description</string>
+ <string>base_category</string>
<string>portal_type</string>
- <string>base_category</string>
+ <string>catalog_index</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -110,6 +111,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>catalog_index</string>
<string>title</string>
<string>description</string>
+ <string>base_category</string>
<string>portal_type</string>
- <string>base_category</string>
+ <string>catalog_index</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -110,6 +111,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_destination_section_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_destination_section_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_destination_section_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_destination_section_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>catalog_index</string>
<string>title</string>
<string>description</string>
+ <string>base_category</string>
<string>portal_type</string>
- <string>base_category</string>
+ <string>catalog_index</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -110,6 +111,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_social_insurance_annotation_line_source_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_social_insurance_annotation_line_source_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_social_insurance_annotation_line_source_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_social_insurance_annotation_line_source_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -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>
@@ -116,6 +117,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_source_section_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_source_section_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_source_section_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_source_section_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>catalog_index</string>
<string>title</string>
<string>description</string>
+ <string>base_category</string>
<string>portal_type</string>
- <string>base_category</string>
+ <string>catalog_index</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -110,6 +111,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml [utf8] Mon May 18 13:25:24 2009
@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>catalog_index</string>
<string>title</string>
<string>description</string>
+ <string>base_category</string>
<string>portal_type</string>
- <string>base_category</string>
+ <string>catalog_index</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -110,6 +111,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_destination_section_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_destination_section_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_destination_section_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_destination_section_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>catalog_index</string>
<string>title</string>
<string>description</string>
+ <string>base_category</string>
<string>portal_type</string>
- <string>base_category</string>
+ <string>catalog_index</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -110,6 +111,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_social_insurance_annotation_line_source_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_social_insurance_annotation_line_source_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_social_insurance_annotation_line_source_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_social_insurance_annotation_line_source_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -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>
@@ -116,6 +117,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_source_section_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_source_section_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_source_section_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_source_section_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>catalog_index</string>
<string>title</string>
<string>description</string>
+ <string>base_category</string>
<string>portal_type</string>
- <string>base_category</string>
+ <string>catalog_index</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -110,6 +111,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_specialise_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_specialise_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_specialise_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_specialise_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -13,12 +13,13 @@
<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>title</string>
<string>relation_setter_id</string>
- <string>description</string>
- <string>portal_type</string>
- <string>base_category</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -111,6 +112,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_source_section_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_source_section_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_source_section_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_source_section_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -14,9 +14,10 @@
<value>
<list>
<string>title</string>
+ <string>portal_type</string>
<string>columns</string>
- <string>portal_type</string>
<string>parameter_list</string>
+ <string>proxy_listbox_ids</string>
</list>
</value>
</item>
@@ -139,6 +140,21 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_social_insurance_annotation_line_source_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_social_insurance_annotation_line_source_title.xml?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_social_insurance_annotation_line_source_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_social_insurance_annotation_line_source_title.xml [utf8] Mon May 18 13:25:24 2009
@@ -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>
@@ -116,6 +117,17 @@
</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>
</item>
Modified: erp5/trunk/bt5/erp5_payroll/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/change_log?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/change_log [utf8] Mon May 18 13:25:24 2009
@@ -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.
Modified: erp5/trunk/bt5/erp5_payroll/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_payroll/bt/revision?rev=27023&r1=27022&r2=27023&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_payroll/bt/revision [utf8] Mon May 18 13:25:24 2009
@@ -1,1 +1,1 @@
-403
+404
More information about the Erp5-report
mailing list