diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml index 1825dc1416e16e87df918aa399783c53b5abac7b..3ef9d7b68719495f60ea9a3f19c47413154f3137 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view.xml @@ -88,9 +88,9 @@ <key> <string>hidden</string> </key> <value> <list> - <string>listbox_create_line_</string> <string>listbox_int_index</string> <string>listbox_float_index</string> + <string>listbox_create_line</string> </list> </value> </item> @@ -105,7 +105,6 @@ <string>my_price_currency</string> <string>my_specialise_title_list</string> <string>my_default_calculation_script_id</string> - <string>listbox_create_line</string> </list> </value> </item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml index 6bf40cdc8ff7cf72c0ebd20076f9a06741006c36..26a42fae6209e9cbe2f7edad33d787ada8b1d1f8 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox.xml @@ -13,6 +13,7 @@ <key> <string>delegated_list</string> </key> <value> <list> + <string>all_columns</string> <string>columns</string> <string>editable_columns</string> <string>portal_types</string> @@ -79,6 +80,57 @@ <key> <string>values</string> </key> <value> <dictionary> + <item> + <key> <string>all_columns</string> </key> + <value> + <list> + <tuple> + <string>int_index</string> + <string>Payslip Order</string> + </tuple> + <tuple> + <string>title</string> + <string>Title</string> + </tuple> + <tuple> + <string>resource_title</string> + <string>Service</string> + </tuple> + <tuple> + <string>reference</string> + <string>Reference</string> + </tuple> + <tuple> + <string>description</string> + <string>Description</string> + </tuple> + <tuple> + <string>create_line</string> + <string>Create Line</string> + </tuple> + <tuple> + <string>trade_phase_title</string> + <string>Trade Phase</string> + </tuple> + <tuple> + <string>calculation_script_id</string> + <string>Calculation Script</string> + </tuple> + <tuple> + <string>base_contribution_list</string> + <string>Base Contribution</string> + </tuple> + <tuple> + <string>base_application_list</string> + <string>Base Application</string> + </tuple> + <tuple> + <string>variation_category_list</string> + <string>Variation Axes</string> + </tuple> + </list> + </value> + </item> <item> <key> <string>columns</string> </key> <value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line.xml index 10753978910b8dd0ca00f099d9a14da1cedc18df..96c67c87ffa1a6bb0da770a05bdf5a201c0a0109 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line.xml @@ -13,6 +13,7 @@ <key> <string>delegated_list</string> </key> <value> <list> + <string>default</string> <string>description</string> <string>title</string> </list> @@ -56,6 +57,12 @@ <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> @@ -83,6 +90,10 @@ <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> @@ -109,4 +120,20 @@ </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>cell/isCreateLine</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line_.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line_.xml deleted file mode 100644 index 0af28fd19290b2149032dfee43c7f8833c3769cc..0000000000000000000000000000000000000000 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModel_view/listbox_create_line_.xml +++ /dev/null @@ -1,130 +0,0 @@ -<?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>title</string> - </list> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>listbox_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>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>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>cell/isCreateLine</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index 7ad80225027a26278893c2ea0e8f1b2bae19b6dd..6efca19ea0b6814902678d61d3b643d78797c000 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -480 \ No newline at end of file +481 \ No newline at end of file