Skip to content

erp5
erp5
Commit 6deec1cb authored by Kevin Deldycke's avatar Kevin Deldycke
Browse files
Options

Fix some UI and fields name. 

Calculate taxable grand total on printing.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10957 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c3f4f188
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 94 deletions
bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Line/quantity.xml
View file @ 6deec1cb
......@@ -58,7 +58,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Pay Sheet Cells</string> </value>
<value> <string>Cells</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
......
bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Line/view.xml
View file @ 6deec1cb
......@@ -58,7 +58,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Pay Sheet Line View</string> </value>
<value> <string>View</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
......
bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Line.xml
View file @ 6deec1cb
......@@ -112,7 +112,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
<value> <string>Pay Sheet Line</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_id.xml
View file @ 6deec1cb
......@@ -215,7 +215,7 @@
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>editable_expression</string> </key>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_resource_title.xml
View file @ 6deec1cb
......@@ -245,6 +245,14 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>allow_creation</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>allow_jump</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
......@@ -255,7 +263,17 @@
</item>
<item>
<key> <string>catalog_index</string> </key>
<value> <string>relative_url</string> </value>
<value> <string>title</string> </value>
</item>
<item>
<key> <string>columns</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>container_getter_id</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
......@@ -313,29 +331,61 @@
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra_item</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>first_item</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>jump_method</string> </key>
<value> <string>Base_jumpToRelatedDocument</string> </value>
</item>
<item>
<key> <string>list_method</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>not_viewable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>parameter_list</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
<string>Service</string>
<string>Service</string>
<string>Payroll Service</string>
<string>Payroll Service</string>
</tuple>
</list>
</value>
......@@ -352,9 +402,19 @@
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>sort</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Social Service</string> </value>
<value> <string>Payroll Service</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml
View file @ 6deec1cb
......@@ -343,7 +343,7 @@
</tuple>
<tuple>
<string>description</string>
<string>Comment</string>
<string>Description</string>
</tuple>
<tuple>
<string>resource_title</string>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview/listbox.xml
View file @ 6deec1cb
......@@ -316,44 +316,7 @@
<item>
<key> <string>all_columns</string> </key>
<value>
<list>
<tuple>
<string>service_title</string>
<string>Contribution</string>
</tuple>
<tuple>
<string>salary_range_title</string>
<string>Base Type</string>
</tuple>
<tuple>
<string>base</string>
<string>Base Value</string>
</tuple>
<tuple>
<string>employer_share</string>
<string>Employer Share</string>
</tuple>
<tuple>
<string>employee_share</string>
<string>Employee Share</string>
</tuple>
<tuple>
<string>description</string>
<string>Comment</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>
<list/>
</value>
</item>
<item>
......@@ -405,7 +368,7 @@
</tuple>
<tuple>
<string>description</string>
<string>Comment</string>
<string>Description</string>
</tuple>
<tuple>
<string>service_id</string>
......@@ -476,19 +439,19 @@
</tuple>
<tuple>
<string>description</string>
<string>Comment</string>
<string>Description</string>
</tuple>
<tuple>
<string>service_id</string>
<string>Service ID</string>
<string></string>
</tuple>
<tuple>
<string>salary_range</string>
<string>Salary Range</string>
<string></string>
</tuple>
<tuple>
<string>tax_category</string>
<string>Tax Category</string>
<string></string>
</tuple>
</list>
</value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewPreview/listbox_description.xml
View file @ 6deec1cb
......@@ -243,7 +243,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Comment</string> </value>
<value> <string>Description</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
......
bt5/erp5_payroll/bt/revision
View file @ 6deec1cb
111
\ No newline at end of file
115
\ 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