Skip to content

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

- add reference field in the PaySheetLine_view 

- add a line property_movement_group_on_cell on the builder to be able to copy
the reference on cells
- remove my_float_index since the calculation can be done without order

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27733 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3f6f51f0
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 16 deletions
bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_builder.xml
View file @ 03fcd6ee
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</item> </item>
<item> <item>
<key> <string>last_id</string> </key> <key> <string>last_id</string> </key>
<value> <string>4</string> </value> <value> <string>6</string> </value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
......
bt5/erp5_payroll/PathTemplateItem/portal_deliveries/pay_sheet_builder/property_movement_group_on_cell.xml 0 → 100644
View file @ 03fcd6ee
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="PropertyMovementGroup" module="Products.ERP5Type.Document.PropertyMovementGroup"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>divergence_scope/property</string>
<string>collect_order_group/cell</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>property_movement_group_on_cell</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Property Movement Group</string> </value>
</item>
<item>
<key> <string>tested_property</string> </key>
<value>
<tuple>
<string>reference</string>
</tuple>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>property_movement_group_on_cell</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml
View file @ 03fcd6ee
...@@ -89,6 +89,7 @@ ...@@ -89,6 +89,7 @@
<value> <value>
<list> <list>
<string>my_title</string> <string>my_title</string>
<string>my_reference</string>
<string>my_resource_title</string> <string>my_resource_title</string>
<string>my_source_section_title</string> <string>my_source_section_title</string>
<string>my_destination_section_title</string> <string>my_destination_section_title</string>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_int_index.xml
View file @ 03fcd6ee
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>title</string>
<string>css_class</string> <string>css_class</string>
<string>title</string>
</list> </list>
</value> </value>
</item> </item>
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>PaySheet Order</string> </value> <value> <string>Payslip Order</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_float_index.xml → bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view/my_reference.xml
View file @ 03fcd6ee
...@@ -13,14 +13,15 @@ ...@@ -13,14 +13,15 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>description</string> <string>display_width</string>
<string>editable</string>
<string>title</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_float_index</string> </value> <value> <string>my_reference</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -76,12 +77,16 @@ ...@@ -76,12 +77,16 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>description</string> </key> <key> <string>display_width</string> </key>
<value> <string>Pay Sheet Lines will be displayed in this order when printing the Pay Sheet.</string> </value> <value> <int>20</int> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_integer_value</string> </value> <value> <string>my_string_field</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
...@@ -93,7 +98,7 @@ ...@@ -93,7 +98,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>PaySheet Order</string> </value> <value> <string>Reference</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml
View file @ 03fcd6ee
...@@ -101,14 +101,13 @@ ...@@ -101,14 +101,13 @@
<value> <value>
<list> <list>
<string>my_title</string> <string>my_title</string>
<string>my_float_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_calculation_script_id</string> <string>my_calculation_script_id</string>
<string>my_price</string> <string>my_price</string>
<string>my_quantity</string> <string>my_quantity</string>
<string>my_trade_phase</string> <string>my_trade_phase</string>
<string>my_int_index</string>
</list> </list>
</value> </value>
</item> </item>
......
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_int_index.xml
View file @ 03fcd6ee
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>description</string> <string>css_class</string>
<string>display_width</string>
<string>title</string> <string>title</string>
</list> </list>
</value> </value>
...@@ -56,6 +57,16 @@ ...@@ -56,6 +57,16 @@
<key> <string>tales</string> </key> <key> <string>tales</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</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>
...@@ -68,6 +79,10 @@ ...@@ -68,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>
...@@ -76,8 +91,12 @@ ...@@ -76,8 +91,12 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>description</string> </key> <key> <string>css_class</string> </key>
<value> <string>Pay Sheet Lines calculation will be done following this ordering</string> </value> <value> <string>figure</string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>5</int> </value>
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
...@@ -93,7 +112,7 @@ ...@@ -93,7 +112,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Calculation Order</string> </value> <value> <string>Payslip Order</string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -101,4 +120,20 @@ ...@@ -101,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: preferences.getPreference(\'preferred_quantity_field_width\', 8)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
bt5/erp5_payroll/bt/revision
View file @ 03fcd6ee
472 475
\ 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