lab.nexedi.com will be down from Thursday, 20 March 2025, 07:30:00 UTC for a duration of approximately 2 hours

Commit 054fd121 authored by Kevin Deldycke's avatar Kevin Deldycke

Better dynamic display of PaySheet fast input.

Pass preview line details within the line and don't try to guess the line service according its order.
Change naming convention to make naming consistent.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10835 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b5e2a7ff
......@@ -243,7 +243,7 @@
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>title</string> </key>
......
......@@ -243,7 +243,7 @@
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>size</string> </key>
......
......@@ -97,18 +97,23 @@
<key> <string>hidden</string> </key>
<value>
<list>
<string>listbox_title</string>
<string>listbox_base</string>
<string>listbox_employer_share_rate</string>
<string>listbox_base_name</string>
<string>listbox_employee_share_rate</string>
<string>listbox_service_id</string>
<string>listbox_salary_range</string>
<string>listbox_tax_category</string>
<string>listbox_salary_range_title</string>
<string>listbox_service_title</string>
<string>listbox_employee_share</string>
<string>listbox_employer_share</string>
</list>
</value>
</item>
<item>
<key> <string>left</string> </key>
<value>
<list/>
<list>
<string>explanation</string>
</list>
</value>
</item>
<item>
......
......@@ -318,24 +318,36 @@
<value>
<list>
<tuple>
<string>title</string>
<string>Tax Title</string>
<string>service_title</string>
<string>Contribution</string>
</tuple>
<tuple>
<string>base_name</string>
<string>Base Name</string>
<string>salary_range_title</string>
<string>Base Type</string>
</tuple>
<tuple>
<string>base</string>
<string>Base Value</string>
</tuple>
<tuple>
<string>employer_share_rate</string>
<string>Employer Share Rate (%)</string>
<string>employer_share</string>
<string>Employer Share</string>
</tuple>
<tuple>
<string>employee_share_rate</string>
<string>Employee Share Rate (%)</string>
<string>employee_share</string>
<string>Employee Share</string>
</tuple>
<tuple>
<string>service_id</string>
<string>Service ID</string>
</tuple>
<tuple>
<string>salary_range</string>
<string>Salary Range</string>
</tuple>
<tuple>
<string>tax_category</string>
<string>Tax Category</string>
</tuple>
</list>
</value>
......@@ -368,24 +380,36 @@
<value>
<list>
<tuple>
<string>title</string>
<string>Tax Title</string>
<string>service_title</string>
<string>Contribution</string>
</tuple>
<tuple>
<string>base_name</string>
<string>Base Name</string>
<string>salary_range_title</string>
<string>Base Type</string>
</tuple>
<tuple>
<string>base</string>
<string>Base Value</string>
</tuple>
<tuple>
<string>employer_share_rate</string>
<string>Employer Share Rate (%)</string>
<string>employer_share</string>
<string>Employer Share</string>
</tuple>
<tuple>
<string>employee_share_rate</string>
<string>Employee Share Rate (%)</string>
<string>employee_share</string>
<string>Employee Share</string>
</tuple>
<tuple>
<string>service_id</string>
<string>Service ID</string>
</tuple>
<tuple>
<string>salary_range</string>
<string>Salary Range</string>
</tuple>
<tuple>
<string>tax_category</string>
<string>Tax Category</string>
</tuple>
</list>
</value>
......@@ -435,12 +459,24 @@
<string>Base Value</string>
</tuple>
<tuple>
<string>employer_share_rate</string>
<string>Employer Share Rate (%)</string>
<string>employer_share</string>
<string>Employer Share</string>
</tuple>
<tuple>
<string>employee_share_rate</string>
<string>Employee Share Rate (%)</string>
<string>employee_share</string>
<string>Employee Share</string>
</tuple>
<tuple>
<string>service_id</string>
<string>Service ID</string>
</tuple>
<tuple>
<string>salary_range</string>
<string>Salary Range</string>
</tuple>
<tuple>
<string>tax_category</string>
<string>Tax Category</string>
</tuple>
</list>
</value>
......@@ -483,6 +519,10 @@
<list/>
</value>
</item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_types</string> </key>
<value>
......@@ -522,12 +562,12 @@
<value>
<list>
<tuple>
<string>title</string>
<string>Tax Title</string>
<string>service_title</string>
<string>Contribution</string>
</tuple>
<tuple>
<string>base_name</string>
<string>Base Name</string>
<string>Base Type</string>
</tuple>
</list>
</value>
......
......@@ -144,6 +144,16 @@
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>input_style</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>precision</string> </key>
<value> <string></string> </value>
</item>
<item>
......@@ -171,7 +181,7 @@
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
<value> <string>figure</string> </value>
</item>
<item>
<key> <string>default</string> </key>
......@@ -211,7 +221,7 @@
</item>
<item>
<key> <string>input_style</string> </key>
<value> <string>-1234.5</string> </value>
<value> <string>-1 234.5</string> </value>
</item>
<item>
<key> <string>precision</string> </key>
......@@ -235,4 +245,23 @@
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<tuple>
<string>Products.Formulator.TALESField</string>
<string>TALESMethod</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: cell.salary_range.endswith(\'forfait\') and True or False</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
......@@ -14,7 +14,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_title</string> </value>
<value> <string>listbox_salary_range</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -243,7 +243,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Title</string> </value>
<value> <string>Salary Range</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
......
......@@ -14,7 +14,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_base_name</string> </value>
<value> <string>listbox_service_id</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -243,7 +243,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Base Name</string> </value>
<value> <string>Service ID</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
......
......@@ -5,7 +5,7 @@
<tuple>
<tuple>
<string>Products.Formulator.StandardFields</string>
<string>FloatField</string>
<string>StringField</string>
</tuple>
<none/>
</tuple>
......@@ -14,7 +14,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_employer_share_rate</string> </value>
<value> <string>listbox_service_title</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -24,14 +24,14 @@
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>not_float</string> </key>
<value> <string>You did not enter a floating point number.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>too_long</string> </key>
<value> <string>Too much input was given.</string> </value>
</item>
</dictionary>
</value>
</item>
......@@ -83,6 +83,10 @@
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
......@@ -91,6 +95,14 @@
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
......@@ -146,6 +158,10 @@
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
......@@ -154,6 +170,14 @@
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
......@@ -187,11 +211,11 @@
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>10</int> </value>
<value> <int>20</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
......@@ -210,11 +234,7 @@
<value> <int>0</int> </value>
</item>
<item>
<key> <string>input_style</string> </key>
<value> <string>-1234.5</string> </value>
</item>
<item>
<key> <string>precision</string> </key>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
......@@ -223,7 +243,15 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Employer Share Rate (%)</string> </value>
<value> <string>Contribution</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
......
......@@ -5,7 +5,7 @@
<tuple>
<tuple>
<string>Products.Formulator.StandardFields</string>
<string>FloatField</string>
<string>StringField</string>
</tuple>
<none/>
</tuple>
......@@ -14,7 +14,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>listbox_employee_share_rate</string> </value>
<value> <string>listbox_tax_category</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -24,14 +24,14 @@
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>not_float</string> </key>
<value> <string>You did not enter a floating point number.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>too_long</string> </key>
<value> <string>Too much input was given.</string> </value>
</item>
</dictionary>
</value>
</item>
......@@ -83,6 +83,10 @@
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
......@@ -91,6 +95,14 @@
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
......@@ -146,6 +158,10 @@
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
......@@ -154,6 +170,14 @@
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
......@@ -187,11 +211,11 @@
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>10</int> </value>
<value> <int>20</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
......@@ -210,11 +234,7 @@
<value> <int>0</int> </value>
</item>
<item>
<key> <string>input_style</string> </key>
<value> <string>-1234.5</string> </value>
</item>
<item>
<key> <string>precision</string> </key>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
......@@ -223,7 +243,15 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Employee Share Rate (%)</string> </value>
<value> <string>Tax Category</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
......
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