Skip to content

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

- remove calculation_script_id from the listbox and add reference 

- change variable name from create_paysheet_line to create_line

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27736 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent dbbcb81d
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 19 deletions
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml
View file @ 818a9a26
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<string>my_variation_category_list</string> <string>my_variation_category_list</string>
<string>my_base_contribution_list</string> <string>my_base_contribution_list</string>
<string>my_base_application_list</string> <string>my_base_application_list</string>
<string>my_create_paysheet_line</string> <string>my_create_line</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_line.xml 0 → 100644
View file @ 818a9a26
<?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>default</string>
<string>description</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_create_line</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>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<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>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>default</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Usefull for intermediated lines. By default, Pay Sheet Lines are created (checked).</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_checkbox</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</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>Create Line</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>here/isCreateLine</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml
View file @ 818a9a26
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<key> <string>hidden</string> </key> <key> <string>hidden</string> </key>
<value> <value>
<list> <list>
<string>listbox_create_paysheet_line</string> <string>listbox_create_line_</string>
<string>listbox_int_index</string> <string>listbox_int_index</string>
<string>listbox_float_index</string> <string>listbox_float_index</string>
</list> </list>
...@@ -105,6 +105,7 @@ ...@@ -105,6 +105,7 @@
<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>
<string>listbox_create_line</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml
View file @ 818a9a26
...@@ -85,11 +85,7 @@ ...@@ -85,11 +85,7 @@
<list> <list>
<tuple> <tuple>
<string>int_index</string> <string>int_index</string>
<string>Calculation Order</string> <string>Payslip Order</string>
</tuple>
<tuple>
<string>float_index</string>
<string>PaySheet Order</string>
</tuple> </tuple>
<tuple> <tuple>
<string>title</string> <string>title</string>
...@@ -100,16 +96,16 @@ ...@@ -100,16 +96,16 @@
<string>Service</string> <string>Service</string>
</tuple> </tuple>
<tuple> <tuple>
<string>calculation_script_id</string> <string>reference</string>
<string>Model Line Calculation Script</string> <string>Reference</string>
</tuple> </tuple>
<tuple> <tuple>
<string>description</string> <string>description</string>
<string>Description</string> <string>Description</string>
</tuple> </tuple>
<tuple> <tuple>
<string>create_paysheet_line</string> <string>create_line</string>
<string>Create Pay Sheet Line</string> <string>Create Line</string>
</tuple> </tuple>
</list> </list>
</value> </value>
...@@ -127,8 +123,8 @@ ...@@ -127,8 +123,8 @@
<string>int_index</string> <string>int_index</string>
</tuple> </tuple>
<tuple> <tuple>
<string>float_index</string> <string>create_line</string>
<string>float_index</string> <string>Create Line</string>
</tuple> </tuple>
</list> </list>
</value> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_paysheet_line.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line.xml
View file @ 818a9a26
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_create_paysheet_line</string> </value> <value> <string>listbox_create_line</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Create Pay Sheet Line</string> </value> <value> <string>Create Line</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_paysheet_line.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line_.xml
View file @ 818a9a26
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>listbox_create_paysheet_line</string> </value> <value> <string>listbox_create_line_</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Create Pay Sheet Line</string> </value> <value> <string>Create Line</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string>cell/isCreatePaysheetLine</string> </value> <value> <string>cell/isCreateLine</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
bt5/erp5_payroll/bt/revision
View file @ 818a9a26
475 477
\ 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