From e5338267b58e78cca598a7d27bc54c53830a9f9e Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Fri, 13 Sep 2024 06:05:02 +0000 Subject: [PATCH] [BOT] post-merge updates --- README.md | 1 + project_merge/README.rst | 2 +- project_merge/static/description/index.html | 2 +- setup/_metapackage/VERSION.txt | 2 +- setup/_metapackage/setup.py | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b67c10869f..e5c56c2253 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ addon | version | maintainers | summary [project_hr](project_hr/) | 16.0.1.0.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) | Link HR with project [project_key](project_key/) | 16.0.1.0.1 | | Module decorates projects and tasks with Project Key [project_list](project_list/) | 16.0.1.0.1 | | Projects list view +[project_merge](project_merge/) | 16.0.1.0.0 | | Wizard to merge project tasks [project_milestone_tree](project_milestone_tree/) | 16.0.1.0.0 | | This module adds an access to the Milestone tree view. [project_parent](project_parent/) | 16.0.1.0.0 | | Project Parent [project_parent_task_filter](project_parent_task_filter/) | 16.0.1.1.0 | | Add a filter to show the parent tasks diff --git a/project_merge/README.rst b/project_merge/README.rst index 75c5132b74..fe9604c346 100644 --- a/project_merge/README.rst +++ b/project_merge/README.rst @@ -7,7 +7,7 @@ Project Task Merge !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:93f551041526aaa423e90fa7afa58737c4c851c1a177bc9b686e50915d46253b + !! source digest: sha256:169c683973aa2368cd095eb4987cd42d805d74555c48565f2b6ce85fb2f271a8 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/project_merge/static/description/index.html b/project_merge/static/description/index.html index 433717a4d2..e40ebdd10b 100644 --- a/project_merge/static/description/index.html +++ b/project_merge/static/description/index.html @@ -367,7 +367,7 @@

Project Task Merge

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:93f551041526aaa423e90fa7afa58737c4c851c1a177bc9b686e50915d46253b +!! source digest: sha256:169c683973aa2368cd095eb4987cd42d805d74555c48565f2b6ce85fb2f271a8 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

Beta License: AGPL-3 OCA/project Translate me on Weblate Try me on Runboat

This module adds a wizard to merge project tasks.

diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index 96eddc112a..617af9a852 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -16.0.20240819.0 \ No newline at end of file +16.0.20240913.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index 48027667ec..395babbcb8 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -14,6 +14,7 @@ 'odoo-addon-project_hr>=16.0dev,<16.1dev', 'odoo-addon-project_key>=16.0dev,<16.1dev', 'odoo-addon-project_list>=16.0dev,<16.1dev', + 'odoo-addon-project_merge>=16.0dev,<16.1dev', 'odoo-addon-project_milestone_tree>=16.0dev,<16.1dev', 'odoo-addon-project_parent>=16.0dev,<16.1dev', 'odoo-addon-project_parent_task_filter>=16.0dev,<16.1dev',