Skip to content

erp5
erp5
Commit a8efbca3 authored by Fabien Morin's avatar Fabien Morin
Browse files
Options

- remove the field editable from the listbox because this property has been... 

- remove the field editable from the listbox because this property has been removed. Add create_paysheet_line checkbox, that permit to define if the line is normal line or intermediate one (create it or not)
- make possible to specialise a business process
- remove the field my_social_insurance_annotation_line_source_title because now this is defined on the business process

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27434 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2b683f39
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 162 deletions
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml
View file @ a8efbca3
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list> <list>
<string>listbox_editable</string> <string>listbox_create_paysheet_line</string>
<string>listbox_int_index</string> <string>listbox_int_index</string>
<string>listbox_float_index</string> <string>listbox_float_index</string>
</list> </list>
...@@ -102,7 +102,6 @@ ...@@ -102,7 +102,6 @@
<string>my_reference</string> <string>my_reference</string>
<string>my_destination_section_title</string> <string>my_destination_section_title</string>
<string>my_source_section_title</string> <string>my_source_section_title</string>
<string>my_social_insurance_annotation_line_source_title</string>
<string>my_price_currency</string> <string>my_price_currency</string>
<string>my_specialise_title_list</string> <string>my_specialise_title_list</string>
<string>my_default_calculation_script_id</string> <string>my_default_calculation_script_id</string>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml
View file @ a8efbca3
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>columns</string>
<string>editable_columns</string> <string>editable_columns</string>
<string>title</string> <string>portal_types</string>
<string>selection_name</string> <string>selection_name</string>
<string>columns</string>
<string>sort</string> <string>sort</string>
<string>portal_types</string> <string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -108,8 +108,8 @@ ...@@ -108,8 +108,8 @@
<string>Description</string> <string>Description</string>
</tuple> </tuple>
<tuple> <tuple>
<string>editable</string> <string>create_paysheet_line</string>
<string>Editable</string> <string>Create Pay Sheet Line</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -119,8 +119,8 @@ ...@@ -119,8 +119,8 @@
<value> <value>
<list> <list>
<tuple> <tuple>
<string>editable</string> <string>create_paysheet_line</string>
<string>editable</string> <string>Create Pay Sheet Line</string>
</tuple> </tuple>
<tuple> <tuple>
<string>int_index</string> <string>int_index</string>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_editable.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_paysheet_line.xml
View file @ a8efbca3
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string>
<string>default</string> <string>default</string>
<string>title</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_editable</string> </value> <value> <string>listbox_create_paysheet_line</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -74,6 +74,10 @@ ...@@ -74,6 +74,10 @@
<key> <string>target</string> </key> <key> <string>target</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -81,6 +85,10 @@ ...@@ -81,6 +85,10 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_checkbox</string> </value> <value> <string>my_checkbox</string> </value>
...@@ -95,7 +103,7 @@ ...@@ -95,7 +103,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Editable</string> </value> <value> <string>Create Pay Sheet Line</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -114,7 +122,7 @@ ...@@ -114,7 +122,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>cell/getEditable</string> </value> <value> <string>cell/isCreatePaysheetLine</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_social_insurance_annotation_line_source_title.xml deleted 100644 → 0
View file @ 2b683f39
<?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>title</string>
<string>description</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>
<item>
<key> <string>id</string> </key>
<value> <string>my_social_insurance_annotation_line_source_title</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>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>allow_jump</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>base_category</string> </key>
<value> <string>source</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 Organisation that provides the Social Security.</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_relation_field</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>Organisation</string>
<string>Organisation</string>
</tuple>
</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>
</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>Social Security</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/my_specialise_title_list.xml
View file @ a8efbca3
...@@ -107,6 +107,10 @@ ...@@ -107,6 +107,10 @@
<string>Pay Sheet Model</string> <string>Pay Sheet Model</string>
<string>Pay Sheet Model</string> <string>Pay Sheet Model</string>
</tuple> </tuple>
<tuple>
<string>Business Process</string>
<string>Business Process</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -118,6 +122,10 @@ ...@@ -118,6 +122,10 @@
<string>PaySheetModelModule_viewPaySheetModelList/listbox</string> <string>PaySheetModelModule_viewPaySheetModelList/listbox</string>
<string>Pay Sheet Models</string> <string>Pay Sheet Models</string>
</tuple> </tuple>
<tuple>
<string>BusinessProcessModule_viewBusinessProcessList/listbox</string>
<string>Business Process</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_payroll/bt/revision
View file @ a8efbca3
441 442
\ 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