Merge pull request #628 from OCA/16.0

Syncing from upstream OCA/reporting-engine (16.0)

README.md

@@ -21,7 +21,7 @@ Available addons
 ----------------
 addon | version | maintainers | summary
 --- | --- | --- | ---
-[base_comment_template](base_comment_template/) | 16.0.2.2.0 |  | Add conditional mako template to any reporton models that inherits comment.template.
+[base_comment_template](base_comment_template/) | 16.0.2.2.1 |  | Add conditional mako template to any reporton models that inherits comment.template.
 [bi_sql_editor](bi_sql_editor/) | 16.0.1.1.0 | [![legalsylvain](https://github.com/legalsylvain.png?size=30px)](https://github.com/legalsylvain) | BI Views builder, based on Materialized or Normal SQL Views
 [bi_view_editor](bi_view_editor/) | 16.0.1.1.0 |  | Graphical BI views builder for Odoo
 [bi_view_editor_spreadsheet_dashboard](bi_view_editor_spreadsheet_dashboard/) | 16.0.1.0.0 |  | Glue module for BI View Editor and Spreadsheet Dashboard

base_comment_template/README.rst

@@ -7,7 +7,7 @@ Base Comments Templates
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:7b997157e82302b911ae2417ae973c558527388bcd3e40d34e446c42988d7e10
+   !! source digest: sha256:00fc443044a8adc3983e4fd2f2627928cc6fe8001f4115c1a66d70b455ba14ee
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

base_comment_template/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Base Comments Templates",
     "summary": "Add conditional mako template to any report"
     "on models that inherits comment.template.",
-    "version": "16.0.2.2.0",
+    "version": "16.0.2.2.1",
     "category": "Reporting",
     "website": "https://github.com/OCA/reporting-engine",
     "author": "Camptocamp, Odoo Community Association (OCA)",

base_comment_template/models/comment_template.py

@@ -3,6 +3,8 @@
 # Copyright 2020 NextERP Romania SRL
 # Copyright 2021-2022 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+import markupsafe
+
 from odoo import api, fields, models
 from odoo.osv import expression
 from odoo.tools.safe_eval import safe_eval
@@ -61,4 +63,4 @@ def render_comment(
             add_context=add_context,
             post_process=post_process,
         )
-        return comment_texts[self.id] or ""
+        return markupsafe.Markup(comment_texts[self.id]) or ""

base_comment_template/static/description/index.html

@@ -366,7 +366,7 @@ <h1 class="title">Base Comments Templates</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:7b997157e82302b911ae2417ae973c558527388bcd3e40d34e446c42988d7e10
+!! source digest: sha256:00fc443044a8adc3983e4fd2f2627928cc6fe8001f4115c1a66d70b455ba14ee
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/reporting-engine/tree/16.0/base_comment_template"><img alt="OCA/reporting-engine" src="https://img.shields.io/badge/github-OCA%2Freporting--engine-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/reporting-engine-16-0/reporting-engine-16-0-base_comment_template"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Add a new mixin class to define templates of comments to print on documents.

bi_view_editor/i18n/ja.po

@@ -8,15 +8,16 @@ msgstr ""
 "Project-Id-Version: reporting-engine (8.0)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-09-18 04:34+0000\n"
-"PO-Revision-Date: 2016-03-21 15:33+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: Japanese (http://www.transifex.com/oca/OCA-reporting-"
-"engine-8-0/language/ja/)\n"
+"PO-Revision-Date: 2024-01-12 07:36+0000\n"
+"Last-Translator: \"Ivy Liu (QRTL)\" <[email protected]>\n"
+"Language-Team: Japanese (http://www.transifex.com/oca/"
+"OCA-reporting-engine-8-0/language/ja/)\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. module: bi_view_editor
 #. odoo-python
@@ -53,7 +54,7 @@ msgstr ""
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__action_id
 msgid "Action"
-msgstr ""
+msgstr "アクション"
 
 #. module: bi_view_editor
 #. odoo-python
@@ -72,17 +73,17 @@ msgstr ""
 #: code:addons/bi_view_editor/models/bve_view.py:0
 #, python-format
 msgid "BI View"
-msgstr ""
+msgstr "BIビュー"
 
 #. module: bi_view_editor
 #: model:ir.model,name:bi_view_editor.model_bve_view
 msgid "BI View Editor"
-msgstr ""
+msgstr "BIビューエディタ"
 
 #. module: bi_view_editor
 #: model:ir.model,name:bi_view_editor.model_bve_view_line
 msgid "BI View Editor Lines"
-msgstr ""
+msgstr "BIビューエディタ明細"
 
 #. module: bi_view_editor
 #: model:res.groups,name:bi_view_editor.group_bve_manager
@@ -92,7 +93,7 @@ msgstr ""
 #. module: bi_view_editor
 #: model:ir.model,name:bi_view_editor.model_base
 msgid "Base"
-msgstr ""
+msgstr "ベース"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__bve_view_id
@@ -111,7 +112,7 @@ msgstr ""
 #: code:addons/bi_view_editor/static/src/components/bi_view_editor/bi_view_editor.xml:0
 #, python-format
 msgid "Clear"
-msgstr ""
+msgstr "クリア"
 
 #. module: bi_view_editor
 #: model_terms:ir.actions.act_window,help:bi_view_editor.action_bi_view_editor_view_form
@@ -124,7 +125,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__column
 #, python-format
 msgid "Column"
-msgstr ""
+msgstr "カラム"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,help:bi_view_editor.field_bve_view__over_condition
@@ -136,20 +137,18 @@ msgstr ""
 
 #. module: bi_view_editor
 #: model:ir.model,name:bi_view_editor.model_wizard_ir_model_menu_create
-#, fuzzy
 msgid "Create Menu Wizard"
-msgstr "作成日"
+msgstr "メニューウィザード作成"
 
 #. module: bi_view_editor
 #: model_terms:ir.ui.view,arch_db:bi_view_editor.view_bi_view_editor_view_form
-#, fuzzy
 msgid "Create a Menu"
-msgstr "作成日"
+msgstr "メニュー作成"
 
 #. module: bi_view_editor
 #: model:ir.model.fields.selection,name:bi_view_editor.selection__bve_view__state__created
 msgid "Created"
-msgstr ""
+msgstr "作成"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__create_uid
@@ -176,22 +175,22 @@ msgstr ""
 #: model:ir.ui.menu,name:bi_view_editor.menu_bi_view_editor_custom_reports
 #: model:ir.ui.menu,name:bi_view_editor.menu_bi_view_editor_view
 msgid "Custom BI Views"
-msgstr ""
+msgstr "カスタムBIビュー"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__data
 msgid "Data"
-msgstr ""
+msgstr "データ"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__description
 msgid "Description"
-msgstr ""
+msgstr "説明"
 
 #. module: bi_view_editor
 #: model_terms:ir.ui.view,arch_db:bi_view_editor.view_bi_view_editor_view_form
 msgid "Details"
-msgstr ""
+msgstr "詳細"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__display_name
@@ -202,7 +201,7 @@ msgstr "表示名"
 #. module: bi_view_editor
 #: model:ir.model.fields.selection,name:bi_view_editor.selection__bve_view__state__draft
 msgid "Draft"
-msgstr ""
+msgstr "ドラフト"
 
 #. module: bi_view_editor
 #: model_terms:ir.ui.view,arch_db:bi_view_editor.view_bi_view_editor_view_form
@@ -227,7 +226,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__field_id
 #: model_terms:ir.ui.view,arch_db:bi_view_editor.view_bi_view_editor_view_form
 msgid "Field"
-msgstr ""
+msgstr "フィールド"
 
 #. module: bi_view_editor
 #. odoo-python
@@ -240,15 +239,14 @@ msgstr ""
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__field_name
-#, fuzzy
 msgid "Field Name"
-msgstr "表示名"
+msgstr "フィールド名"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__field_ids
 #: model_terms:ir.ui.view,arch_db:bi_view_editor.view_bi_view_editor_view_form
 msgid "Fields"
-msgstr ""
+msgstr "フィールド"
 
 #. module: bi_view_editor
 #. odoo-python
@@ -269,12 +267,12 @@ msgstr ""
 #. module: bi_view_editor
 #: model_terms:ir.ui.view,arch_db:bi_view_editor.view_bi_view_editor_view_form
 msgid "Generate BI View"
-msgstr ""
+msgstr "BIビュー生成"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__group_ids
 msgid "Groups"
-msgstr ""
+msgstr "グループ"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__id
@@ -351,39 +349,39 @@ msgstr ""
 #: code:addons/bi_view_editor/static/src/components/bi_view_editor/field_list.xml:0
 #, python-format
 msgid "List"
-msgstr ""
+msgstr "リスト"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__list_attr
 msgid "List Attribute"
-msgstr ""
+msgstr "属性一覧"
 
 #. module: bi_view_editor
 #. odoo-javascript
 #: code:addons/bi_view_editor/static/src/components/bi_view_editor/field_list.xml:0
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__measure
 #, python-format
 msgid "Measure"
-msgstr ""
+msgstr "計測"
 
 #. module: bi_view_editor
 #. odoo-javascript
 #: code:addons/bi_view_editor/static/src/components/bi_view_editor/field_list.xml:0
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__model_id
 #, python-format
 msgid "Model"
-msgstr ""
+msgstr "モデル"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__model_name
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__model_name
 msgid "Model Name"
-msgstr ""
+msgstr "モデル名"
 
 #. module: bi_view_editor
 #: model:ir.model,name:bi_view_editor.model_ir_model
 msgid "Models"
-msgstr ""
+msgstr "モデル"
 
 #. module: bi_view_editor
 #. odoo-javascript
@@ -412,19 +410,19 @@ msgstr ""
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__note
 #: model_terms:ir.ui.view,arch_db:bi_view_editor.view_bi_view_editor_view_form
 msgid "Notes"
-msgstr ""
+msgstr "ノート"
 
 #. module: bi_view_editor
 #: model_terms:ir.ui.view,arch_db:bi_view_editor.view_bi_view_editor_view_form
 msgid "Open BI View"
-msgstr ""
+msgstr "BIビューを開く"
 
 #. module: bi_view_editor
 #. odoo-javascript
 #: code:addons/bi_view_editor/static/src/components/bi_view_editor/field_list.xml:0
 #, python-format
 msgid "Options"
-msgstr ""
+msgstr "オプション"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__over_condition
@@ -434,12 +432,12 @@ msgstr ""
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__query
 msgid "Query"
-msgstr ""
+msgstr "クエリ"
 
 #. module: bi_view_editor
 #: model_terms:ir.ui.view,arch_db:bi_view_editor.view_bi_view_editor_view_form
 msgid "Query Builder"
-msgstr ""
+msgstr "クエリ ビルダ"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__relation
@@ -463,12 +461,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__row
 #, python-format
 msgid "Row"
-msgstr ""
+msgstr "行"
 
 #. module: bi_view_editor
 #: model_terms:ir.ui.view,arch_db:bi_view_editor.view_bi_view_editor_view_form
 msgid "SQL"
-msgstr ""
+msgstr "SQL"
 
 #. module: bi_view_editor
 #: model_terms:ir.ui.view,arch_db:bi_view_editor.view_bi_view_editor_view_form
@@ -478,22 +476,22 @@ msgstr "セキュリティ"
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__sequence
 msgid "Sequence"
-msgstr ""
+msgstr "シーケンス"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__state
 msgid "State"
-msgstr ""
+msgstr "状態"
 
 #. module: bi_view_editor
 #: model:ir.model.fields.selection,name:bi_view_editor.selection__bve_view_line__list_attr__sum
 msgid "Sum"
-msgstr ""
+msgstr "合計"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__table_alias
 msgid "Table Alias"
-msgstr ""
+msgstr "テーブル別名"
 
 #. module: bi_view_editor
 #. odoo-python
@@ -520,7 +518,7 @@ msgstr ""
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view_line__ttype
 msgid "Type"
-msgstr ""
+msgstr "タイプ"
 
 #. module: bi_view_editor
 #. odoo-javascript
@@ -534,7 +532,7 @@ msgstr ""
 #: code:addons/bi_view_editor/static/src/components/bi_view_editor/join_node_dialog.xml:0
 #, python-format
 msgid "Use the field"
-msgstr ""
+msgstr "フィールド使用"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,help:bi_view_editor.field_bve_view__data
@@ -553,7 +551,7 @@ msgstr ""
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__user_ids
 msgid "Users"
-msgstr ""
+msgstr "ユーザ"
 
 #. module: bi_view_editor
 #: model:ir.model.fields,field_description:bi_view_editor.field_bve_view__view_id