diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml index 9f4befbe16d70146669e6a3f00930c25687578bc..fd5bac8b5063a1ec13ec8784d0f1ca9afca4c6d3 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view.xml @@ -119,7 +119,7 @@ <string>my_variation_category_list</string> <string>my_base_contribution_list</string> <string>my_base_application_list</string> - <string>my_do_not_create_paysheet_line</string> + <string>my_create_paysheet_line</string> <string>my_editable</string> </list> </value> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_do_not_create_paysheet_line.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_paysheet_line.xml similarity index 95% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_do_not_create_paysheet_line.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_paysheet_line.xml index 0d0789d3669290a31cafc86d5dc15b95f8544e57..d9b5eccaefd1c2b13599ee4c409f8327f38793e8 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_do_not_create_paysheet_line.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_view/my_create_paysheet_line.xml @@ -11,7 +11,7 @@ <dictionary> <item> <key> <string>id</string> </key> - <value> <string>my_do_not_create_paysheet_line</string> </value> + <value> <string>my_create_paysheet_line</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -136,7 +136,7 @@ </item> <item> <key> <string>description</string> </key> - <value> <string></string> </value> + <value> <string>Usefull for intermediated lines. By default, Pay Sheet Lines are created (checked).</string> </value> </item> <item> <key> <string>editable</string> </key> @@ -160,7 +160,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Don\'t create Pay Sheet Line</string> </value> + <value> <string>Create Pay Sheet Line</string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index 1713e61879b31926baea088e51f1ce68fa8d015f..d61d31715dc7e2f5c05934136b599cc817ce097a 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -334 \ No newline at end of file +336 \ No newline at end of file diff --git a/product/ERP5/PropertySheet/PaySheetModelLine.py b/product/ERP5/PropertySheet/PaySheetModelLine.py index eb21dce2c7bc34bf666c6e1f31599fa3c33e097e..b65f1c4d385111f8f5ccd8d9b35c390a90b68bac 100644 --- a/product/ERP5/PropertySheet/PaySheetModelLine.py +++ b/product/ERP5/PropertySheet/PaySheetModelLine.py @@ -39,11 +39,12 @@ class PaySheetModelLine: 'type' : 'boolean', 'mode' : 'w' }, - { 'id' : 'do_not_create_paysheet_line', - 'description' : 'If set to 1, the corresponding paysheet line will not' + { 'id' : 'create_paysheet_line', + 'description' : 'A flag indicating if the corresponding paysheet line will' ' be created', 'type' : 'boolean', - 'mode' : 'w' + 'mode' : 'w', + 'default' : True, }, { 'id' : 'calculation_script_id', 'description' : 'If no script found on Pay Sheet Model Lines, this'