Skip to content

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

- Now we use Pay Sheet Model Cell in Pay Sheet Model Line 

- change descriptions : 'movement' term was not correct here, they are not movements but cells
- add quantity and price on Model Line
- add Trade Phase on Model Line
- remove editable checkbox on model line. This is useless since we can add model lines in the paysheet. Editable lines will be the model lines in the paysheet.
- remove my_source_annotation_line_reference and my_source_title. This is now defined on the business process

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27432 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 38cf74b0
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 67 deletions
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml
View file @ 2b683f39
...@@ -105,9 +105,10 @@ ...@@ -105,9 +105,10 @@
<string>my_int_index</string> <string>my_int_index</string>
<string>my_reference</string> <string>my_reference</string>
<string>my_resource_title</string> <string>my_resource_title</string>
<string>my_source_annotation_line_reference</string>
<string>my_source_title</string>
<string>my_calculation_script_id</string> <string>my_calculation_script_id</string>
<string>my_price</string>
<string>my_quantity</string>
<string>my_trade_phase</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -119,7 +120,6 @@ ...@@ -119,7 +120,6 @@
<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_paysheet_line</string>
<string>my_editable</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/matrixbox.xml
View file @ 2b683f39
...@@ -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>cell_base_id</string> <string>cell_base_id</string>
<string>cell_portal_type</string> <string>cell_portal_type</string>
<string>lines</string>
<string>columns</string> <string>columns</string>
<string>tabs</string>
<string>editable_attributes</string> <string>editable_attributes</string>
<string>global_attributes</string> <string>global_attributes</string>
<string>lines</string>
<string>tabs</string>
<string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</item> </item>
<item> <item>
<key> <string>cell_portal_type</string> </key> <key> <string>cell_portal_type</string> </key>
<value> <string>Pay Sheet Cell</string> </value> <value> <string>Pay Sheet Model Cell</string> </value>
</item> </item>
<item> <item>
<key> <string>columns</string> </key> <key> <string>columns</string> </key>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_base_contribution_list.xml
View file @ 2b683f39
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<value> <value>
<list> <list>
<string>description</string> <string>description</string>
<string>title</string>
<string>items</string> <string>items</string>
<string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>This movement will contribute to the selected bases.</string> </value> <value> <string>This cell will contribute to the selected bases.</string> </value>
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
...@@ -94,6 +94,12 @@ ...@@ -94,6 +94,12 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value> <value> <string>Base_viewPayrollFieldLibrary</string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<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_create_paysheet_line.xml
View file @ 2b683f39
...@@ -56,6 +56,10 @@ ...@@ -56,6 +56,10 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -68,6 +72,10 @@ ...@@ -68,6 +72,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>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_title.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_price.xml
View file @ 2b683f39
...@@ -15,16 +15,13 @@ ...@@ -15,16 +15,13 @@
<list> <list>
<string>title</string> <string>title</string>
<string>description</string> <string>description</string>
<string>base_category</string> <string>enabled</string>
<string>portal_type</string>
<string>catalog_index</string>
<string>proxy_listbox_ids</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_source_title</string> </value> <value> <string>my_price</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -60,6 +57,16 @@ ...@@ -60,6 +57,16 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -72,6 +79,10 @@ ...@@ -72,6 +79,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>
...@@ -80,46 +91,20 @@ ...@@ -80,46 +91,20 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>base_category</string> </key> <key> <string>description</string> </key>
<value> <string>source</string> </value> <value> <string>The price paid for the one unit of quantity</string> </value>
</item>
<item>
<key> <string>catalog_index</string> </key>
<value> <string>title</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>enabled</string> </key>
<value> <string>The Organisation that will collect the corresponding tax.</string> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_relation_field</string> </value> <value> <string>my_price</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value> <value> <string>PaySheetTransaction_viewFieldLibrary</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>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
...@@ -127,7 +112,7 @@ ...@@ -127,7 +112,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Payroll Service Provider</string> </value> <value> <string>Hourly Rate</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -135,4 +120,20 @@ ...@@ -135,4 +120,20 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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>python: not here.getVariationCategoryList()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_source_annotation_line_reference.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_quantity.xml
View file @ 2b683f39
...@@ -13,14 +13,13 @@ ...@@ -13,14 +13,13 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>description</string> <string>enabled</string>
<string>title</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_source_annotation_line_reference</string> </value> <value> <string>my_quantity</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -56,6 +55,12 @@ ...@@ -56,6 +55,12 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>enabled</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
...@@ -76,29 +81,41 @@ ...@@ -76,29 +81,41 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>description</string> </key> <key> <string>enabled</string> </key>
<value> <string>The Payroll Service Provider will be the one defined in the Annotation Line with this reference.</string> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_string_field</string> </value> <value> <string>my_work_time_annotation_line_quantity</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value> <value> <string>AnnotationLine_viewFieldLibrary</string> </value>
</item> </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>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string>Annotation Line Reference for Payroll Service Provider</string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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>python: not here.getVariationCategoryList()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_editable.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_trade_phase.xml
View file @ 2b683f39
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_editable</string> </value> <value> <string>my_trade_phase</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -76,11 +76,11 @@ ...@@ -76,11 +76,11 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_checkbox</string> </value> <value> <string>my_category</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewPayrollFieldLibrary</string> </value> <value> <string>Base_viewFieldLibrary</string> </value>
</item> </item>
<item> <item>
<key> <string>target</string> </key> <key> <string>target</string> </key>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Editable</string> </value> <value> <string>Trade Phase</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_variation_category_list.xml
View file @ 2b683f39
...@@ -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>hash_script_id</string>
<string>description</string> <string>description</string>
<string>title</string> <string>hash_script_id</string>
<string>items</string>
<string>required</string> <string>required</string>
<string>size</string> <string>size</string>
<string>items</string> <string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>The variations that are applied to this pay sheet movement.</string> </value> <value> <string>The variations that are applied to this pay sheet cell.</string> </value>
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
...@@ -101,6 +101,12 @@ ...@@ -101,6 +101,12 @@
<key> <string>hash_script_id</string> </key> <key> <string>hash_script_id</string> </key>
<value> <string>Base_getMultiListFieldPropertyDictList</string> </value> <value> <string>Base_getMultiListFieldPropertyDictList</string> </value>
</item> </item>
<item>
<key> <string>items</string> </key>
<value>
<list/>
</value>
</item>
<item> <item>
<key> <string>required</string> </key> <key> <string>required</string> </key>
<value> <int>0</int> </value> <value> <int>0</int> </value>
......
bt5/erp5_payroll/bt/revision
View file @ 2b683f39
438 441
\ 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