From c9770e5eb7ca7825ae7eba25ea1bfb1cad2e8579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 26 Sep 2016 06:27:57 +0000 Subject: [PATCH] accounting: normalize glossary term for "portal_type" Use "Transaction Type" everywhere and stop using "Journal Type". On accounting transaction views, it is "Transaction Type". In l10n_fr, l10n_de, l10n_pl both "Journal Type" and "Transaction Type" where translated to the same term. --- .../AccountModule_viewDialogFieldLibrary/your_portal_type.xml | 2 +- .../AccountModule_viewReportFieldLibrary/your_portal_type.xml | 2 +- .../AccountingTransactionModule_getJournalReportSectionList.py | 2 +- .../my_transaction_portal_type.xml | 2 +- .../test_page_module/user-Howto.Generate.Report.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_portal_type.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_portal_type.xml index 8b7176e6c2..010156a8fd 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_portal_type.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_portal_type.xml @@ -239,7 +239,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Journal Type</string> </value> + <value> <string>Transaction Type</string> </value> </item> <item> <key> <string>unicode</string> </key> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewReportFieldLibrary/your_portal_type.xml b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewReportFieldLibrary/your_portal_type.xml index dd47fb7fc6..fd1d34e9c4 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewReportFieldLibrary/your_portal_type.xml +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewReportFieldLibrary/your_portal_type.xml @@ -237,7 +237,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Journal Type</string> </value> + <value> <string>Transaction Type</string> </value> </item> <item> <key> <string>unicode</string> </key> diff --git a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalReportSectionList.py b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalReportSectionList.py index b5e7c281c0..b07db5a7a0 100644 --- a/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalReportSectionList.py +++ b/bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalReportSectionList.py @@ -68,7 +68,7 @@ selection_columns = ( ('parent_reference', 'Document Reference'),) if len(portal_type) > 1: selection_columns += ( - ('portal_type', 'Journal Type'), ) + ('portal_type', 'Transaction Type'), ) selection_columns += analytic_column_list + ( ('node_title', 'Account'), ('mirror_section_title', 'Third Party'), diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalDialogPolishAccounting/my_transaction_portal_type.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalDialogPolishAccounting/my_transaction_portal_type.xml index a88bbdaffa..48a09a6640 100644 --- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalDialogPolishAccounting/my_transaction_portal_type.xml +++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalDialogPolishAccounting/my_transaction_portal_type.xml @@ -244,7 +244,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Journal Type</string> </value> + <value> <string>Transaction Type</string> </value> </item> <item> <key> <string>unicode</string> </key> diff --git a/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Generate.Report.html b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Generate.Report.html index 6fae893e87..3d40e81322 100644 --- a/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Generate.Report.html +++ b/bt5/erp5_user_tutorial/PathTemplateItem/test_page_module/user-Howto.Generate.Report.html @@ -38,7 +38,7 @@ </p><p> Secondly, in the blue area, you can choose which <strong>Simulation State(s)</strong> you want to display in your report, and the - <strong>Journal Type (types of transactions)</strong> + <strong>Transaction Type</strong> you need to display. </p><p> Thirdly, in the yellow area, you have to <strong>choose an Account, this is compulsory</strong> -- 2.30.9