Skip to content

erp5
erp5
Commit a05570c3 authored by Yusei Tahara's avatar Yusei Tahara
Browse files
Options

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
parent 5b1c03c8
Show whitespace changes
Inline Side-by-side
Showing with 253 additions and 44 deletions
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewNetSalaryReportSection/listbox.xml
View file @ a05570c3
...@@ -13,14 +13,15 @@ ...@@ -13,14 +13,15 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>editable_columns</string>
<string>stat_method</string>
<string>title</string> <string>title</string>
<string>select</string>
<string>selection_name</string>
<string>columns</string> <string>columns</string>
<string>list_method</string> <string>list_method</string>
<string>count_method</string>
<string>stat_method</string>
<string>selection_name</string>
<string>search</string> <string>search</string>
<string>select</string>
<string>editable_columns</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -104,6 +105,10 @@ ...@@ -104,6 +105,10 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>count_method</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>editable_columns</string> </key> <key> <string>editable_columns</string> </key>
<value> <value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetLineReportSection/listbox.xml
View file @ a05570c3
...@@ -13,14 +13,15 @@ ...@@ -13,14 +13,15 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>editable_columns</string>
<string>stat_method</string>
<string>title</string> <string>title</string>
<string>select</string>
<string>selection_name</string>
<string>columns</string> <string>columns</string>
<string>list_method</string> <string>list_method</string>
<string>count_method</string>
<string>stat_method</string>
<string>selection_name</string>
<string>search</string> <string>search</string>
<string>select</string>
<string>editable_columns</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -120,6 +121,10 @@ ...@@ -120,6 +121,10 @@
</list> </list>
</value> </value>
</item> </item>
<item>
<key> <string>count_method</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>editable_columns</string> </key> <key> <string>editable_columns</string> </key>
<value> <value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view/my_source_title.xml
View file @ a05570c3
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -109,6 +110,17 @@ ...@@ -109,6 +110,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/EmploymentContract_view/my_resource_title.xml
View file @ a05570c3
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -109,6 +110,17 @@ ...@@ -109,6 +110,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_destination_section_title.xml
View file @ a05570c3
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -109,6 +110,17 @@ ...@@ -109,6 +110,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_source_section_title.xml
View file @ a05570c3
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -114,6 +115,17 @@ This can be the tax authority for taxes, or the employee for wages.</string> </v ...@@ -114,6 +115,17 @@ This can be the tax authority for taxes, or the employee for wages.</string> </v
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_resource_title.xml
View file @ a05570c3
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -109,6 +110,17 @@ ...@@ -109,6 +110,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml
View file @ a05570c3
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -109,6 +110,17 @@ ...@@ -109,6 +110,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_destination_section_title.xml
View file @ a05570c3
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -109,6 +110,17 @@ ...@@ -109,6 +110,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_social_insurance_annotation_line_source_title.xml
View file @ a05570c3
...@@ -13,13 +13,14 @@ ...@@ -13,13 +13,14 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>relation_setter_id</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>allow_jump</string> <string>allow_jump</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>relation_setter_id</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -115,6 +116,17 @@ ...@@ -115,6 +116,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>relation_setter_id</string> </key> <key> <string>relation_setter_id</string> </key>
<value> <string>setSocialInsuranceAnnotationLineSourceUid</string> </value> <value> <string>setSocialInsuranceAnnotationLineSourceUid</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_source_section_title.xml
View file @ a05570c3
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -109,6 +110,17 @@ ...@@ -109,6 +110,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml
View file @ a05570c3
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -109,6 +110,17 @@ ...@@ -109,6 +110,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_destination_section_title.xml
View file @ a05570c3
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -109,6 +110,17 @@ ...@@ -109,6 +110,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_social_insurance_annotation_line_source_title.xml
View file @ a05570c3
...@@ -13,13 +13,14 @@ ...@@ -13,13 +13,14 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>relation_setter_id</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>allow_jump</string> <string>allow_jump</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>relation_setter_id</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -115,6 +116,17 @@ ...@@ -115,6 +116,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>relation_setter_id</string> </key> <key> <string>relation_setter_id</string> </key>
<value> <string>setSocialInsuranceAnnotationLineSourceUid</string> </value> <value> <string>setSocialInsuranceAnnotationLineSourceUid</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_source_section_title.xml
View file @ a05570c3
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -109,6 +110,17 @@ ...@@ -109,6 +110,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_specialise_title.xml
View file @ a05570c3
...@@ -13,12 +13,13 @@ ...@@ -13,12 +13,13 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>relation_setter_id</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>relation_setter_id</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -110,6 +111,17 @@ ...@@ -110,6 +111,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>relation_setter_id</string> </key> <key> <string>relation_setter_id</string> </key>
<value> <string>PaySheetTransaction_setSpecialiseAndApplyModel</string> </value> <value> <string>PaySheetTransaction_setSpecialiseAndApplyModel</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/my_source_section_title.xml
View file @ a05570c3
...@@ -14,9 +14,10 @@ ...@@ -14,9 +14,10 @@
<value> <value>
<list> <list>
<string>title</string> <string>title</string>
<string>columns</string>
<string>portal_type</string> <string>portal_type</string>
<string>columns</string>
<string>parameter_list</string> <string>parameter_list</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -138,6 +139,21 @@ ...@@ -138,6 +139,21 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <string>Click to edit the target</string> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/my_social_insurance_annotation_line_source_title.xml
View file @ a05570c3
...@@ -13,13 +13,14 @@ ...@@ -13,13 +13,14 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>catalog_index</string>
<string>title</string> <string>title</string>
<string>relation_setter_id</string>
<string>description</string> <string>description</string>
<string>portal_type</string>
<string>allow_jump</string> <string>allow_jump</string>
<string>base_category</string> <string>base_category</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>relation_setter_id</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -115,6 +116,17 @@ ...@@ -115,6 +116,17 @@
</list> </list>
</value> </value>
</item> </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> <item>
<key> <string>relation_setter_id</string> </key> <key> <string>relation_setter_id</string> </key>
<value> <string>setSocialInsuranceAnnotationLineSourceUid</string> </value> <value> <string>setSocialInsuranceAnnotationLineSourceUid</string> </value>
......
bt5/erp5_payroll/bt/change_log
View file @ a05570c3
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 2009-05-11 yusei
* Bump up the version. * Bump up the version.
* Simplify field libraries and proxy fields. Old field libraries are kept for backward compatibility. * Simplify field libraries and proxy fields. Old field libraries are kept for backward compatibility.
......
bt5/erp5_payroll/bt/revision
View file @ a05570c3
403 404
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7