From 0abc5bbcfbff4b76f5985d04c24396adcec99908 Mon Sep 17 00:00:00 2001 From: Fabien Morin <fabien@nexedi.com> Date: Tue, 4 Dec 2007 17:56:31 +0000 Subject: [PATCH] - modify PaySheetTransaction_getLineListAsDict and PaySheetTransaction_getMovementList to return the Payroll Service - readd the removed script PaySheetTransaction_buildAccountingLine git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18007 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_types/Pay%20Sheet%20Cell/view.xml | 7 +- .../portal_types/Payroll%20Service/view.xml | 7 +- .../portal_categories/base_amount.xml | 102 ++++++++- .../portal_categories/salary_range.xml | 4 +- .../portal_categories/tax_category.xml | 4 +- .../Pay%20Sheet%20Model%20Module.xml | 2 +- .../erp5_payroll/AnnotationLine_view.xml | 2 +- .../erp5_payroll/PaySheetLine_view.xml | 2 +- .../matrixbox_total_price.xml | 12 +- ...aySheetTransaction_buildAccountingLine.xml | 199 ++++++++++++++++++ .../PaySheetTransaction_getLineListAsDict.xml | 3 +- .../PaySheetTransaction_getMovementList.xml | 1 + .../erp5_payroll/PaySheetTransaction_view.xml | 2 +- .../PaySheetTransaction_view/listbox.xml | 16 +- .../PaySheetTransaction_view/listbox_base.xml | 2 +- .../listbox_employee_share_amount.xml | 2 +- .../listbox_employee_share_rate.xml | 2 +- .../listbox_employer_share_amount.xml | 2 +- .../listbox_employer_share_rate.xml | 2 +- .../my_start_date.xml | 4 +- .../PaySheetTransaction_view/my_stop_date.xml | 4 +- .../listbox.xml | 18 +- .../listbox.xml | 12 +- .../listbox.xml | 8 +- .../PayrollService_view/my_description.xml | 2 +- .../PaySheetModelLine_view.xml | 10 +- .../PaySheetModelLine_view/my_description.xml | 6 +- .../listbox.xml | 12 +- .../PaySheetModel_view.xml | 10 +- .../PaySheetModel_view/listbox.xml | 12 +- .../PaySheetModel_view/my_description.xml | 6 +- .../PaySheetModel_view/my_effective_date.xml | 18 +- .../PaySheetModel_view/my_expiration_date.xml | 18 +- .../listbox.xml | 12 +- .../PaySheetModel_viewSliceSettings.xml | 10 +- bt5/erp5_payroll/bt/revision | 2 +- 36 files changed, 413 insertions(+), 124 deletions(-) create mode 100644 bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_buildAccountingLine.xml diff --git a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Cell/view.xml b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Cell/view.xml index 9c462fe45b..566afda81f 100644 --- a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Cell/view.xml +++ b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Cell/view.xml @@ -67,11 +67,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> + <global name="Expression" module="Products.CMFCore.Expression"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Payroll%20Service/view.xml b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Payroll%20Service/view.xml index 21e1e5fd69..ecd1742319 100644 --- a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Payroll%20Service/view.xml +++ b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Payroll%20Service/view.xml @@ -67,11 +67,8 @@ <record id="2" aka="AAAAAAAAAAI="> <pickle> <tuple> - <tuple> - <string>Products.CMFCore.Expression</string> - <string>Expression</string> - </tuple> - <none/> + <global name="Expression" module="Products.CMFCore.Expression"/> + <tuple/> </tuple> </pickle> <pickle> diff --git a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/base_amount.xml b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/base_amount.xml index 3d21d57db1..3a998fcf95 100644 --- a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/base_amount.xml +++ b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/base_amount.xml @@ -37,12 +37,24 @@ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> </item> + <item> + <key> <string>acquisition_append_value</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>acquisition_base_category</string> </key> <value> <tuple/> </value> </item> + <item> + <key> <string>acquisition_copy_value</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>acquisition_mask_value</string> </key> + <value> <int>1</int> </value> + </item> <item> <key> <string>acquisition_object_id</string> </key> <value> @@ -53,6 +65,10 @@ <key> <string>acquisition_portal_type</string> </key> <value> <string>python: []</string> </value> </item> + <item> + <key> <string>acquisition_sync_value</string> </key> + <value> <int>0</int> </value> + </item> <item> <key> <string>categories</string> </key> <value> @@ -64,24 +80,100 @@ </tuple> </value> </item> + <item> + <key> <string>category_type</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>criterion_property</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>fallback_base_category</string> </key> <value> - <none/> + <tuple/> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>base_amount</string> </value> + <value> <string>base_amount</string> </value> + </item> + <item> + <key> <string>id_generator</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id_group</string> </key> + <value> + <none/> + </value> </item> <item> <key> <string>last_id</string> </key> <value> <string>1</string> </value> </item> + <item> + <key> <string>membership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>membership_criterion_category</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>multimembership_criterion_base_category</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>portal_type</string> </key> <value> <string>Base Category</string> </value> </item> + <item> + <key> <string>read_permission</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>rid</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>short_title</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>sid</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>test_method_id</string> </key> + <value> + <tuple/> + </value> + </item> <item> <key> <string>title</string> </key> <value> <string>Base Amount</string> </value> @@ -92,6 +184,12 @@ <none/> </value> </item> + <item> + <key> <string>write_permission</string> </key> + <value> + <none/> + </value> + </item> </dictionary> </pickle> </record> diff --git a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/salary_range.xml b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/salary_range.xml index 17933f9013..a34e71fda8 100644 --- a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/salary_range.xml +++ b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/salary_range.xml @@ -89,9 +89,7 @@ </item> <item> <key> <string>description</string> </key> - <value> - <none/> - </value> + <value> <string></string> </value> </item> <item> <key> <string>fallback_base_category</string> </key> diff --git a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/tax_category.xml b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/tax_category.xml index c061e8a9b7..caa78e2ce9 100644 --- a/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/tax_category.xml +++ b/bt5/erp5_payroll/CategoryTemplateItem/portal_categories/tax_category.xml @@ -93,9 +93,7 @@ </item> <item> <key> <string>description</string> </key> - <value> - <none/> - </value> + <value> <string></string> </value> </item> <item> <key> <string>fallback_base_category</string> </key> diff --git a/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Module.xml b/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Module.xml index bb7394ec61..1a01214d88 100644 --- a/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Module.xml +++ b/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Module.xml @@ -101,7 +101,7 @@ An ERP5 Binder document class will eventually be defined\n in order to implement a binder of documents which can itself\n be categorized.\n - </string> </value> +</string> </value> </item> <item> <key> <string>factory</string> </key> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view.xml index 40ce24e89b..763eeff5c0 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AnnotationLine_view.xml @@ -95,7 +95,7 @@ </value> </item> <item> - <key> <string>right</string> </key> + <key> <string>right</string> </key> <value> <list> <string>my_quantity_unit</string> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml index 7cfe28ced7..322ce2cf95 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_view.xml @@ -85,7 +85,7 @@ </value> </item> <item> - <key> <string>hidden</string> </key> + <key> <string>hidden</string> </key> <value> <list> <string>my_base_amount_list</string> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_total_price.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_total_price.xml index 90288d9695..97c25d5ac8 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_total_price.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetLine_viewCells/matrixbox_total_price.xml @@ -58,13 +58,13 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <string></string> </value> </item> <item> @@ -80,7 +80,7 @@ <value> <string></string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string></string> </value> </item> </dictionary> @@ -91,11 +91,11 @@ <value> <dictionary> <item> - <key> <string>default</string> </key> + <key> <string>default</string> </key> <value> <string></string> </value> </item> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <int>0</int> </value> </item> <item> @@ -119,7 +119,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Share</string> </value> </item> </dictionary> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_buildAccountingLine.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_buildAccountingLine.xml new file mode 100644 index 0000000000..29bdc22552 --- /dev/null +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_buildAccountingLine.xml @@ -0,0 +1,199 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>Python_magic</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>Script_magic</string> </key> + <value> <int>3</int> </value> + </item> + <item> + <key> <string>__ac_local_roles__</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_bind_names</string> </key> + <value> + <object> + <klass> + <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>_asgns</string> </key> + <value> + <dictionary> + <item> + <key> <string>name_container</string> </key> + <value> <string>container</string> </value> + </item> + <item> + <key> <string>name_context</string> </key> + <value> <string>context</string> </value> + </item> + <item> + <key> <string>name_m_self</string> </key> + <value> <string>script</string> </value> + </item> + <item> + <key> <string>name_subpath</string> </key> + <value> <string>traverse_subpath</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>_body</string> </key> + <value> <string encoding="cdata"><![CDATA[ + +PRIORITY = 1\n +\n +pay_sheet = context\n +\n +# Delete Accounting Lines\n +for accounting_line in pay_sheet.objectValues(portal_type = [\'Pay Sheet Transaction Line\']):\n + pay_sheet.deleteContent(accounting_line.getId())\n +\n +applied_rule = context.getCausalityRelatedValue()\n +# Delete the applied rule if present\n +if applied_rule != None:\n + simulation_tool = context.portal_simulation\n + ar_id = applied_rule.getId()\n + ar_url = applied_rule.absolute_url()\n + simulation_tool.deleteObject(ar_id)\n +\n + for applied_rule in simulation_tool.objectValues():\n + if ar_id == applied_rule.getId():\n + return "Applied rule <a href=\'%s\'>%s</a> of <a href=\'\'>%s</a> paysheet not deleted" % (ar_url, ar_id, pay_sheet.absolute_url(), pay_sheet.getPath())\n +\n +previous_tag = pay_sheet.getPath() + \'_firstUpdateAppliedRule\'\n +expand_tag = pay_sheet.getPath() + \'_expand\'\n +\n +activate_kw = { \'tag\' : expand_tag\n + , \'priority\': PRIORITY\n + }\n +\n +pay_sheet.activate( tag = expand_tag\n + , after_tag = previous_tag\n + , priority = PRIORITY\n + ).updateAppliedRule( rule_id = \'default_invoice_rule\'\n + , activate_kw = activate_kw\n + )\n +\n +builder = pay_sheet.portal_deliveries.pay_sheet_transaction_builder\n +builder.activate( activity = \'SQLQueue\'\n + , after_tag = expand_tag\n + , priority = PRIORITY\n + ).build( explanation_uid = pay_sheet.getUid()\n + , activate_kw = activate_kw\n + )\n +\n +return None\n + + +]]></string> </value> + </item> + <item> + <key> <string>_code</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_filepath</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>_params</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>errors</string> </key> + <value> + <tuple/> + </value> + </item> + <item> + <key> <string>func_code</string> </key> + <value> + <object> + <klass> + <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> + </klass> + <tuple/> + <state> + <dictionary> + <item> + <key> <string>co_argcount</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>co_varnames</string> </key> + <value> + <tuple> + <string>PRIORITY</string> + <string>context</string> + <string>pay_sheet</string> + <string>_getiter_</string> + <string>_getattr_</string> + <string>accounting_line</string> + <string>applied_rule</string> + <string>None</string> + <string>simulation_tool</string> + <string>ar_id</string> + <string>ar_url</string> + <string>previous_tag</string> + <string>expand_tag</string> + <string>activate_kw</string> + <string>builder</string> + </tuple> + </value> + </item> + </dictionary> + </state> + </object> + </value> + </item> + <item> + <key> <string>func_defaults</string> </key> + <value> + <none/> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>PaySheetTransaction_buildAccountingLine</string> </value> + </item> + <item> + <key> <string>warnings</string> </key> + <value> + <tuple/> + </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml index eea825ee49..2ba6d45726 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getLineListAsDict.xml @@ -82,6 +82,7 @@ for line in line_list: \n line_dict = {\n \'group\' : line.getSourceSectionTitle(),\n \'title\' : line.getTitle(),\n + \'payroll_service\' : getattr(line, \'payroll_service\', None)\n }\n \n line_dict[\'slice\'] = getattr(line, \'slice\', None)\n @@ -171,9 +172,9 @@ return line_dict_list\n <string>line_dict_list</string> <string>_getiter_</string> <string>line</string> - <string>line_dict</string> <string>getattr</string> <string>None</string> + <string>line_dict</string> <string>_write_</string> <string>_getitem_</string> <string>round</string> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml index b03d237154..c6748aed12 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getMovementList.xml @@ -107,6 +107,7 @@ for paysheet_line in paysheet_line_list:\n base_name=base_name,\n base=base,\n base_participation_list=base_participation_list,\n + payroll_service=payroll_service.getId(),\n **share_dict))\n \n if kw.has_key(\'sort_on\'):\n diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml index 799669b700..0ed8f9d17f 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view.xml @@ -93,7 +93,7 @@ </value> </item> <item> - <key> <string>hidden</string> </key> + <key> <string>hidden</string> </key> <value> <list> <string>listbox_employee_share_amount</string> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml index e594edad96..7db7146ea2 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox.xml @@ -118,7 +118,7 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>all_columns</string> </key> + <key> <string>all_columns</string> </key> <value> <list/> </value> @@ -130,7 +130,7 @@ </value> </item> <item> - <key> <string>columns</string> </key> + <key> <string>columns</string> </key> <value> <list> <tuple> @@ -157,7 +157,7 @@ </value> </item> <item> - <key> <string>editable_columns</string> </key> + <key> <string>editable_columns</string> </key> <value> <list> <tuple> @@ -204,7 +204,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>list_method</string> </key> + <key> <string>list_method</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent> </value> @@ -214,7 +214,7 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>portal_types</string> </key> + <key> <string>portal_types</string> </key> <value> <list> <tuple> @@ -229,11 +229,11 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>selection_name</string> </key> + <key> <string>selection_name</string> </key> <value> <string>paysheet_line_list_selection</string> </value> </item> <item> - <key> <string>sort</string> </key> + <key> <string>sort</string> </key> <value> <list> <tuple> @@ -248,7 +248,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Pay Sheet Lines</string> </value> </item> <item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_base.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_base.xml index 0736cac65c..5842ea6d95 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_base.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_base.xml @@ -75,7 +75,7 @@ <value> <dictionary> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <int>0</int> </value> </item> <item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_share_amount.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_share_amount.xml index a313340029..f5e3ab7b62 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_share_amount.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_share_amount.xml @@ -75,7 +75,7 @@ <value> <dictionary> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <int>0</int> </value> </item> <item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_share_rate.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_share_rate.xml index 068e214c12..50ef9f2421 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_share_rate.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employee_share_rate.xml @@ -75,7 +75,7 @@ <value> <dictionary> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <int>0</int> </value> </item> <item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_share_amount.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_share_amount.xml index 8dfe62e9ed..95a1ab076a 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_share_amount.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_share_amount.xml @@ -75,7 +75,7 @@ <value> <dictionary> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <int>0</int> </value> </item> <item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_share_rate.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_share_rate.xml index bc4d3ed7fe..1512b0a0d1 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_share_rate.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/listbox_employer_share_rate.xml @@ -75,7 +75,7 @@ <value> <dictionary> <item> - <key> <string>editable</string> </key> + <key> <string>editable</string> </key> <value> <int>0</int> </value> </item> <item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_start_date.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_start_date.xml index 02d1f99c03..3ca7766195 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_start_date.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_start_date.xml @@ -85,7 +85,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string></string> </value> </item> <item> @@ -101,7 +101,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Work Period Start</string> </value> </item> </dictionary> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_stop_date.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_stop_date.xml index c01584110f..a86eb08996 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_stop_date.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_view/my_stop_date.xml @@ -85,7 +85,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string></string> </value> </item> <item> @@ -101,7 +101,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Work Period End</string> </value> </item> </dictionary> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml index d6ffa2713c..132326f868 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAccountingLineList/listbox.xml @@ -93,7 +93,7 @@ </value> </item> <item> - <key> <string>columns</string> </key> + <key> <string>columns</string> </key> <value> <list> <tuple> @@ -120,7 +120,7 @@ </value> </item> <item> - <key> <string>editable_columns</string> </key> + <key> <string>editable_columns</string> </key> <value> <list> <tuple> @@ -159,7 +159,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>global_attributes</string> </key> + <key> <string>global_attributes</string> </key> <value> <list> <tuple> @@ -170,7 +170,7 @@ </value> </item> <item> - <key> <string>list_method</string> </key> + <key> <string>list_method</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -180,7 +180,7 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>portal_types</string> </key> + <key> <string>portal_types</string> </key> <value> <list> <tuple> @@ -195,11 +195,11 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>selection_name</string> </key> + <key> <string>selection_name</string> </key> <value> <string>pay_sheet_transaction_line_list_selection</string> </value> </item> <item> - <key> <string>stat_columns</string> </key> + <key> <string>stat_columns</string> </key> <value> <list> <tuple> @@ -214,7 +214,7 @@ </value> </item> <item> - <key> <string>stat_method</string> </key> + <key> <string>stat_method</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> @@ -224,7 +224,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Pay Sheet Transaction Lines</string> </value> </item> <item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox.xml index 7aa6837f8e..16960bfc69 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAnnotationLineList/listbox.xml @@ -90,7 +90,7 @@ </value> </item> <item> - <key> <string>columns</string> </key> + <key> <string>columns</string> </key> <value> <list> <tuple> @@ -121,7 +121,7 @@ </value> </item> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string>Details of contributions based on salary.</string> </value> </item> <item> @@ -145,7 +145,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>list_method</string> </key> + <key> <string>list_method</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -155,7 +155,7 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>portal_types</string> </key> + <key> <string>portal_types</string> </key> <value> <list> <tuple> @@ -170,7 +170,7 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>selection_name</string> </key> + <key> <string>selection_name</string> </key> <value> <string>annotation_line_list_selection</string> </value> </item> <item> @@ -178,7 +178,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Annotation Lines</string> </value> </item> <item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollServiceModule_viewPayrollServiceList/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollServiceModule_viewPayrollServiceList/listbox.xml index 691183016e..15c9f7521d 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollServiceModule_viewPayrollServiceList/listbox.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollServiceModule_viewPayrollServiceList/listbox.xml @@ -88,7 +88,7 @@ </value> </item> <item> - <key> <string>columns</string> </key> + <key> <string>columns</string> </key> <value> <list> <tuple> @@ -119,7 +119,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>portal_types</string> </key> + <key> <string>portal_types</string> </key> <value> <list> <tuple> @@ -130,7 +130,7 @@ </value> </item> <item> - <key> <string>selection_name</string> </key> + <key> <string>selection_name</string> </key> <value> <string>payroll_service_selection</string> </value> </item> <item> @@ -138,7 +138,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Payroll Services</string> </value> </item> </dictionary> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_description.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_description.xml index 768f60a19b..daa4fa4526 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_description.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PayrollService_view/my_description.xml @@ -92,7 +92,7 @@ <value> <string>BasePdm_FieldLibrary</string> </value> </item> <item> - <key> <string>width</string> </key> + <key> <string>width</string> </key> <value> <int>80</int> </value> </item> </dictionary> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_view.xml index bf80c745d5..9de579202b 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_view.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_view.xml @@ -75,7 +75,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>matrixbox</string> @@ -84,7 +84,7 @@ </value> </item> <item> - <key> <string>center</string> </key> + <key> <string>center</string> </key> <value> <list> <string>my_description</string> @@ -92,7 +92,7 @@ </value> </item> <item> - <key> <string>hidden</string> </key> + <key> <string>hidden</string> </key> <value> <list> <string>matrixbox_predicate_category_list</string> @@ -103,7 +103,7 @@ </value> </item> <item> - <key> <string>left</string> </key> + <key> <string>left</string> </key> <value> <list> <string>my_title</string> @@ -115,7 +115,7 @@ </value> </item> <item> - <key> <string>right</string> </key> + <key> <string>right</string> </key> <value> <list> <string>my_variation_category_list</string> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_view/my_description.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_view/my_description.xml index d1f30804d8..ae32b59711 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_view/my_description.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelLine_view/my_description.xml @@ -80,7 +80,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string></string> </value> </item> <item> @@ -98,11 +98,11 @@ <value> <string>BaseTradeSale_FieldLibrary</string> </value> </item> <item> - <key> <string>height</string> </key> + <key> <string>height</string> </key> <value> <int>5</int> </value> </item> <item> - <key> <string>width</string> </key> + <key> <string>width</string> </key> <value> <int>80</int> </value> </item> </dictionary> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelModule_viewPaySheetModelList/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelModule_viewPaySheetModelList/listbox.xml index d7ec5946df..4d039bd3cc 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelModule_viewPaySheetModelList/listbox.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModelModule_viewPaySheetModelList/listbox.xml @@ -90,7 +90,7 @@ </value> </item> <item> - <key> <string>columns</string> </key> + <key> <string>columns</string> </key> <value> <list> <tuple> @@ -141,7 +141,7 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>search_columns</string> </key> + <key> <string>search_columns</string> </key> <value> <list> <tuple> @@ -172,11 +172,11 @@ </value> </item> <item> - <key> <string>selection_name</string> </key> + <key> <string>selection_name</string> </key> <value> <string>paysheet_model_selection</string> </value> </item> <item> - <key> <string>sort</string> </key> + <key> <string>sort</string> </key> <value> <list> <tuple> @@ -187,7 +187,7 @@ </value> </item> <item> - <key> <string>sort_columns</string> </key> + <key> <string>sort_columns</string> </key> <value> <list> <tuple> @@ -222,7 +222,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Contents</string> </value> </item> <item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view.xml index 64a5539074..2b49a6aeab 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view.xml @@ -75,7 +75,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>listbox</string> @@ -83,7 +83,7 @@ </value> </item> <item> - <key> <string>center</string> </key> + <key> <string>center</string> </key> <value> <list> <string>my_description</string> @@ -91,7 +91,7 @@ </value> </item> <item> - <key> <string>hidden</string> </key> + <key> <string>hidden</string> </key> <value> <list> <string>listbox_editable</string> @@ -101,7 +101,7 @@ </value> </item> <item> - <key> <string>left</string> </key> + <key> <string>left</string> </key> <value> <list> <string>my_title</string> @@ -115,7 +115,7 @@ </value> </item> <item> - <key> <string>right</string> </key> + <key> <string>right</string> </key> <value> <list> <string>my_effective_date</string> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/listbox.xml index c58da70a48..950fff5cdf 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/listbox.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/listbox.xml @@ -114,7 +114,7 @@ </value> </item> <item> - <key> <string>columns</string> </key> + <key> <string>columns</string> </key> <value> <list> <tuple> @@ -149,7 +149,7 @@ </value> </item> <item> - <key> <string>editable_columns</string> </key> + <key> <string>editable_columns</string> </key> <value> <list> <tuple> @@ -192,7 +192,7 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>portal_types</string> </key> + <key> <string>portal_types</string> </key> <value> <list> <tuple> @@ -207,11 +207,11 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>selection_name</string> </key> + <key> <string>selection_name</string> </key> <value> <string>pay_sheet_model_line_list_selection</string> </value> </item> <item> - <key> <string>sort</string> </key> + <key> <string>sort</string> </key> <value> <list> <tuple> @@ -226,7 +226,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Pay Sheet Model Lines</string> </value> </item> <item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/my_description.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/my_description.xml index d1f30804d8..ae32b59711 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/my_description.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/my_description.xml @@ -80,7 +80,7 @@ <value> <dictionary> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string></string> </value> </item> <item> @@ -98,11 +98,11 @@ <value> <string>BaseTradeSale_FieldLibrary</string> </value> </item> <item> - <key> <string>height</string> </key> + <key> <string>height</string> </key> <value> <int>5</int> </value> </item> <item> - <key> <string>width</string> </key> + <key> <string>width</string> </key> <value> <int>80</int> </value> </item> </dictionary> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/my_effective_date.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/my_effective_date.xml index 8ca6a3117a..b005601408 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/my_effective_date.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/my_effective_date.xml @@ -285,28 +285,28 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>Default</string> </key> <value> <list/> </value> </item> <item> - <key> <string>date</string> </key> + <key> <string>date</string> </key> <value> <list> -<string>year</string> -<string>month</string> -<string>day</string> + <string>year</string> + <string>month</string> + <string>day</string> </list> </value> </item> <item> - <key> <string>time</string> </key> + <key> <string>time</string> </key> <value> <list> -<string>hour</string> -<string>minute</string> -<string>ampm</string> + <string>hour</string> + <string>minute</string> + <string>ampm</string> </list> </value> </item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/my_expiration_date.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/my_expiration_date.xml index ec868e7998..8817485e77 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/my_expiration_date.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_view/my_expiration_date.xml @@ -285,28 +285,28 @@ <value> <dictionary> <item> - <key> <string>Default</string> </key> + <key> <string>Default</string> </key> <value> <list/> </value> </item> <item> - <key> <string>date</string> </key> + <key> <string>date</string> </key> <value> <list> -<string>year</string> -<string>month</string> -<string>day</string> + <string>year</string> + <string>month</string> + <string>day</string> </list> </value> </item> <item> - <key> <string>time</string> </key> + <key> <string>time</string> </key> <value> <list> -<string>hour</string> -<string>minute</string> -<string>ampm</string> + <string>hour</string> + <string>minute</string> + <string>ampm</string> </list> </value> </item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewRatioSettingsList/listbox.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewRatioSettingsList/listbox.xml index 30eace9b82..72f5b93456 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewRatioSettingsList/listbox.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewRatioSettingsList/listbox.xml @@ -90,7 +90,7 @@ </value> </item> <item> - <key> <string>columns</string> </key> + <key> <string>columns</string> </key> <value> <list> <tuple> @@ -113,7 +113,7 @@ </value> </item> <item> - <key> <string>description</string> </key> + <key> <string>description</string> </key> <value> <string></string> </value> </item> <item> @@ -137,7 +137,7 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>list_method</string> </key> + <key> <string>list_method</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> @@ -147,7 +147,7 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>portal_types</string> </key> + <key> <string>portal_types</string> </key> <value> <list> <tuple> @@ -162,7 +162,7 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>selection_name</string> </key> + <key> <string>selection_name</string> </key> <value> <string>pay_sheet_ratio_line_list_selection</string> </value> </item> <item> @@ -170,7 +170,7 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> + <key> <string>title</string> </key> <value> <string>Pay Sheet Ratio Settings Lines</string> </value> </item> <item> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewSliceSettings.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewSliceSettings.xml index d3925fe8e4..932467fd74 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewSliceSettings.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_paysheet_model/PaySheetModel_viewSliceSettings.xml @@ -75,7 +75,7 @@ <value> <dictionary> <item> - <key> <string>bottom</string> </key> + <key> <string>bottom</string> </key> <value> <list> <string>matrixbox</string> @@ -84,13 +84,13 @@ </value> </item> <item> - <key> <string>center</string> </key> + <key> <string>center</string> </key> <value> <list/> </value> </item> <item> - <key> <string>hidden</string> </key> + <key> <string>hidden</string> </key> <value> <list> <string>matrixbox_predicate_category_list</string> @@ -101,13 +101,13 @@ </value> </item> <item> - <key> <string>left</string> </key> + <key> <string>left</string> </key> <value> <list/> </value> </item> <item> - <key> <string>right</string> </key> + <key> <string>right</string> </key> <value> <list/> </value> diff --git a/bt5/erp5_payroll/bt/revision b/bt5/erp5_payroll/bt/revision index 12e2555919..6fc1e6e18c 100644 --- a/bt5/erp5_payroll/bt/revision +++ b/bt5/erp5_payroll/bt/revision @@ -1 +1 @@ -177 \ No newline at end of file +178 \ No newline at end of file -- 2.30.9