From 412ad7e754654629fcf3e70b519f5b344072a508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 6 Jun 2022 12:14:20 +0900 Subject: [PATCH] payroll: rename some skins with invalid prefixes PaySheet_getODTStyleSheet => PaySheetTransaction_getODTStyleSheet PaySheet_printAsODT => PaySheetTransaction_printAsODT PaySheet_viewODTPrintDialog => PaySheetTransaction_viewODTPrintDialog PaySheetModeLine_init => PaySheetModelLine_init RatioSettings_view => PaySheetModelRatioLine_view --- .../Pay%20Sheet%20Model%20Ratio%20Line/view.xml | 2 +- .../Pay%20Sheet%20Transaction/pay_sheet_print.xml | 2 +- .../portal_types/Pay%20Sheet%20Model%20Line.xml | 2 +- ...odule_viewPaySheetTransactionListAsODTStyles.xml | 2 +- ...etModeLine_init.py => PaySheetModelLine_init.py} | 0 ...ModeLine_init.xml => PaySheetModelLine_init.xml} | 2 +- ...ngs_view.xml => PaySheetModelRatioLine_view.xml} | 2 +- .../my_description.xml | 0 .../my_quantity.xml | 0 .../my_reference.xml | 0 .../my_title.xml | 0 ...obj => PaySheetTransaction_getODTStyleSheet.bin} | Bin ...xml => PaySheetTransaction_getODTStyleSheet.xml} | 2 +- ...ntAsODT.py => PaySheetTransaction_printAsODT.py} | 0 ...AsODT.xml => PaySheetTransaction_printAsODT.xml} | 2 +- .../PaySheetTransaction_viewAsODTStyles.xml | 2 +- ...l => PaySheetTransaction_viewODTPrintDialog.xml} | 4 ++-- .../your_format.xml | 0 .../your_international_form.xml | 0 .../your_target_language.xml | 0 20 files changed, 11 insertions(+), 11 deletions(-) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{PaySheetModeLine_init.py => PaySheetModelLine_init.py} (100%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{PaySheetModeLine_init.xml => PaySheetModelLine_init.xml} (97%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{RatioSettings_view.xml => PaySheetModelRatioLine_view.xml} (98%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{RatioSettings_view => PaySheetModelRatioLine_view}/my_description.xml (100%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{RatioSettings_view => PaySheetModelRatioLine_view}/my_quantity.xml (100%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{RatioSettings_view => PaySheetModelRatioLine_view}/my_reference.xml (100%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{RatioSettings_view => PaySheetModelRatioLine_view}/my_title.xml (100%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{PaySheet_getODTStyleSheet.obj => PaySheetTransaction_getODTStyleSheet.bin} (100%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{PaySheet_getODTStyleSheet.xml => PaySheetTransaction_getODTStyleSheet.xml} (89%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{PaySheet_printAsODT.py => PaySheetTransaction_printAsODT.py} (100%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{PaySheet_printAsODT.xml => PaySheetTransaction_printAsODT.xml} (96%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{PaySheet_viewODTPrintDialog.xml => PaySheetTransaction_viewODTPrintDialog.xml} (96%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{PaySheet_viewODTPrintDialog => PaySheetTransaction_viewODTPrintDialog}/your_format.xml (100%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{PaySheet_viewODTPrintDialog => PaySheetTransaction_viewODTPrintDialog}/your_international_form.xml (100%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{PaySheet_viewODTPrintDialog => PaySheetTransaction_viewODTPrintDialog}/your_target_language.xml (100%) diff --git a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Model%20Ratio%20Line/view.xml b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Model%20Ratio%20Line/view.xml index d38116f3b7..f6ffdcf6c9 100644 --- a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Model%20Ratio%20Line/view.xml +++ b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Model%20Ratio%20Line/view.xml @@ -71,7 +71,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/RatioSettings_view</string> </value> + <value> <string>string:${object_url}/PaySheetModelRatioLine_view</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml index c5a0a05b84..dfbc5b5053 100644 --- a/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml +++ b/bt5/erp5_payroll/ActionTemplateItem/portal_types/Pay%20Sheet%20Transaction/pay_sheet_print.xml @@ -73,7 +73,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${object_url}/PaySheet_viewODTPrintDialog</string> </value> + <value> <string>string:${object_url}/PaySheetTransaction_viewODTPrintDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Line.xml b/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Line.xml index 4ff1f712a1..e08fe55f3b 100644 --- a/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Line.xml +++ b/bt5/erp5_payroll/PortalTypeTemplateItem/portal_types/Pay%20Sheet%20Model%20Line.xml @@ -64,7 +64,7 @@ </item> <item> <key> <string>init_script</string> </key> - <value> <string>PaySheetModeLine_init</string> </value> + <value> <string>PaySheetModelLine_init</string> </value> </item> <item> <key> <string>permission</string> </key> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListAsODTStyles.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListAsODTStyles.xml index abecf9a0d8..100268d119 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListAsODTStyles.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/AccountingTransactionModule_viewPaySheetTransactionListAsODTStyles.xml @@ -62,7 +62,7 @@ AAA=</string> </value> </item> <item> <key> <string>ooo_stylesheet</string> </key> - <value> <string>PaySheet_getODTStyleSheet</string> </value> + <value> <string>PaySheetTransaction_getODTStyleSheet</string> </value> </item> <item> <key> <string>ooo_xml_file_id</string> </key> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModeLine_init.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_init.py similarity index 100% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModeLine_init.py rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_init.py diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModeLine_init.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_init.xml similarity index 97% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModeLine_init.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_init.xml index 5d17c11bf3..50741a71ba 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModeLine_init.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelLine_init.xml @@ -60,7 +60,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>PaySheetModeLine_init</string> </value> + <value> <string>PaySheetModelLine_init</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view.xml similarity index 98% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view.xml index b803f690af..8b2b0424f3 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view.xml @@ -113,7 +113,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>RatioSettings_view</string> </value> + <value> <string>PaySheetModelRatioLine_view</string> </value> </item> <item> <key> <string>method</string> </key> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_description.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_description.xml similarity index 100% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_description.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_description.xml diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_quantity.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_quantity.xml similarity index 100% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_quantity.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_quantity.xml diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_reference.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_reference.xml similarity index 100% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_reference.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_reference.xml diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_title.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_title.xml similarity index 100% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/RatioSettings_view/my_title.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetModelRatioLine_view/my_title.xml diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_getODTStyleSheet.obj b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTStyleSheet.bin similarity index 100% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_getODTStyleSheet.obj rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTStyleSheet.bin diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_getODTStyleSheet.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTStyleSheet.xml similarity index 89% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_getODTStyleSheet.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTStyleSheet.xml index 20b3c9bd12..f36e4aea34 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_getODTStyleSheet.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getODTStyleSheet.xml @@ -8,7 +8,7 @@ <dictionary> <item> <key> <string>__name__</string> </key> - <value> <string>PaySheet_getODTStyleSheet</string> </value> + <value> <string>PaySheetTransaction_getODTStyleSheet</string> </value> </item> <item> <key> <string>content_type</string> </key> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_printAsODT.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_printAsODT.py similarity index 100% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_printAsODT.py rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_printAsODT.py diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_printAsODT.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_printAsODT.xml similarity index 96% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_printAsODT.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_printAsODT.xml index 00c0386c61..6d5d3faeda 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_printAsODT.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_printAsODT.xml @@ -54,7 +54,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>PaySheet_printAsODT</string> </value> + <value> <string>PaySheetTransaction_printAsODT</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml index 3087d466e7..a322e4116d 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewAsODTStyles.xml @@ -62,7 +62,7 @@ AAA=</string> </value> </item> <item> <key> <string>ooo_stylesheet</string> </key> - <value> <string>PaySheet_getODTStyleSheet</string> </value> + <value> <string>PaySheetTransaction_getODTStyleSheet</string> </value> </item> <item> <key> <string>ooo_xml_file_id</string> </key> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog.xml similarity index 96% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog.xml index ec9e692c89..995fb4df2b 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog.xml @@ -35,7 +35,7 @@ </item> <item> <key> <string>action</string> </key> - <value> <string>PaySheet_printAsODT</string> </value> + <value> <string>PaySheetTransaction_printAsODT</string> </value> </item> <item> <key> <string>description</string> </key> @@ -90,7 +90,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>PaySheet_viewODTPrintDialog</string> </value> + <value> <string>PaySheetTransaction_viewODTPrintDialog</string> </value> </item> <item> <key> <string>method</string> </key> diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_format.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_format.xml similarity index 100% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_format.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_format.xml diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_international_form.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_international_form.xml similarity index 100% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_international_form.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_international_form.xml diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_target_language.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_target_language.xml similarity index 100% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheet_viewODTPrintDialog/your_target_language.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_viewODTPrintDialog/your_target_language.xml -- 2.30.9