Skip to content

Commit

Permalink
Merge branch 'OCA:16.0' into 16.0-openupgrade_framework_end_mig_at_end
Browse files Browse the repository at this point in the history
  • Loading branch information
metaminux authored Jan 9, 2024
2 parents 16de61e + d1054b6 commit 70d514a
Show file tree
Hide file tree
Showing 225 changed files with 9,273 additions and 3,874 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ jobs:
pre-commit:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-python@v2
with:
python-version: "3.11"
- name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ jobs:
unixodbc-dev
- name: Requirements Installation
run: |
sudo npm install -g less less-plugin-clean-css
pip install -q -r odoo/requirements.txt
pip install -r ./openupgrade/requirements.txt
# this is for v15 l10n_eg_edi_eta which crashes without it
Expand Down
6 changes: 0 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,6 @@ repos:
rev: 3.1.8
hooks:
- id: setuptools-odoo-make-default
- id: setuptools-odoo-get-requirements
args:
- --output
- requirements.txt
- --header
- "# generated from manifests external_dependencies"
- repo: https://github.com/PyCQA/flake8
rev: 3.9.2
hooks:
Expand Down
46 changes: 23 additions & 23 deletions docsource/modules150-160.rst

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion oca_dependencies.txt

This file was deleted.

12 changes: 9 additions & 3 deletions openupgrade_framework/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
Openupgrade Framework
=====================

.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:06d77ecf97625ec075fa31dde7f8f41bcf849fa13af0598f8c1de397348f2dfd
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
Expand All @@ -19,8 +22,11 @@ Openupgrade Framework
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/OpenUpgrade-16-0/OpenUpgrade-16-0-openupgrade_framework
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/OpenUpgrade&target_branch=16.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4|
|badge1| |badge2| |badge3| |badge4| |badge5|

This module is a technical module that contains a number of monkeypatches
to improve the behaviour of Odoo when migrating your database using the
Expand Down Expand Up @@ -141,7 +147,7 @@ Bug Tracker

Bugs are tracked on `GitHub Issues <https://github.com/OCA/OpenUpgrade/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/OpenUpgrade/issues/new?body=module:%20openupgrade_framework%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,21 @@ def _raise_view_error(
)


def _check_field_paths(self, node, field_paths, model_name, use):
"""Ignore UnboundLocalError when we squelched the raise about missing fields"""
try:
return View._check_field_paths._original_method(
self, node, field_paths, model_name, use
)
except UnboundLocalError: # pylint: disable=except-pass
pass


_check_xml._original_method = View._check_xml
View._check_xml = _check_xml
check._original_method = NameManager.check
NameManager.check = check
_raise_view_error._original_method = View._raise_view_error
View._raise_view_error = _raise_view_error
_check_field_paths._original_method = View._check_field_paths
View._check_field_paths = _check_field_paths
78 changes: 40 additions & 38 deletions openupgrade_framework/static/description/index.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
<title>Openupgrade Framework</title>
<style type="text/css">

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.

See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/

Expand Down Expand Up @@ -366,8 +366,10 @@ <h1 class="title">Openupgrade Framework</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:06d77ecf97625ec075fa31dde7f8f41bcf849fa13af0598f8c1de397348f2dfd
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" 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" 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" href="https://github.com/OCA/OpenUpgrade/tree/16.0/openupgrade_framework"><img alt="OCA/OpenUpgrade" src="https://img.shields.io/badge/github-OCA%2FOpenUpgrade-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/OpenUpgrade-16-0/OpenUpgrade-16-0-openupgrade_framework"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a></p>
<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/OpenUpgrade/tree/16.0/openupgrade_framework"><img alt="OCA/OpenUpgrade" src="https://img.shields.io/badge/github-OCA%2FOpenUpgrade-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/OpenUpgrade-16-0/OpenUpgrade-16-0-openupgrade_framework"><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/OpenUpgrade&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>This module is a technical module that contains a number of monkeypatches
to improve the behaviour of Odoo when migrating your database using the
OpenUpgrade migration scripts:</p>
Expand Down Expand Up @@ -399,26 +401,26 @@ <h1 class="title">Openupgrade Framework</h1>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#installation" id="id1">Installation</a></li>
<li><a class="reference internal" href="#configuration" id="id2">Configuration</a></li>
<li><a class="reference internal" href="#development" id="id3">Development</a></li>
<li><a class="reference internal" href="#bug-tracker" id="id4">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id5">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id6">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id7">Contributors</a></li>
<li><a class="reference internal" href="#other-credits" id="id8">Other credits</a></li>
<li><a class="reference internal" href="#maintainers" id="id9">Maintainers</a></li>
<li><a class="reference internal" href="#installation" id="toc-entry-1">Installation</a></li>
<li><a class="reference internal" href="#configuration" id="toc-entry-2">Configuration</a></li>
<li><a class="reference internal" href="#development" id="toc-entry-3">Development</a></li>
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-4">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="toc-entry-5">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="toc-entry-6">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="toc-entry-7">Contributors</a></li>
<li><a class="reference internal" href="#other-credits" id="toc-entry-8">Other credits</a></li>
<li><a class="reference internal" href="#maintainers" id="toc-entry-9">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="installation">
<h1><a class="toc-backref" href="#id1">Installation</a></h1>
<h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
<p>This module does not need to be installed on a database.
It simply needs to be available via your <tt class="docutils literal"><span class="pre">addons-path</span></tt>.</p>
</div>
<div class="section" id="configuration">
<h1><a class="toc-backref" href="#id2">Configuration</a></h1>
<h1><a class="toc-backref" href="#toc-entry-2">Configuration</a></h1>
<ul class="simple">
<li>call your odoo instance with the option <tt class="docutils literal"><span class="pre">--load=base,web,openupgrade_framework</span></tt></li>
</ul>
Expand All @@ -427,16 +429,16 @@ <h1><a class="toc-backref" href="#id2">Configuration</a></h1>
<li>add the key to your configuration file:</li>
</ul>
<pre class="code shell literal-block">
<span class="o">[</span>options<span class="o">]</span>
<span class="nv">server_wide_modules</span> <span class="o">=</span> web,openupgrade_framework
<span class="o">[</span>options<span class="o">]</span><span class="w">
</span><span class="nv">server_wide_modules</span><span class="w"> </span><span class="o">=</span><span class="w"> </span>web,openupgrade_framework
</pre>
<p>When you load the module in either way of these ways, and you have the
<cite>openupgrade_scripts</cite> module in your addons path available, the
<cite>–upgrade-path</cite> option of Odoo will be set automatically to the location
of the OpenUpgrade migration scripts.</p>
</div>
<div class="section" id="development">
<h1><a class="toc-backref" href="#id3">Development</a></h1>
<h1><a class="toc-backref" href="#toc-entry-3">Development</a></h1>
<p>The <cite>odoo_patch</cite> folder contains python files in a tree that mimicks the
folder tree of the Odoo project. It contains a number of monkey patches
to improve the migration of an Odoo database between two major versions.</p>
Expand All @@ -453,43 +455,43 @@ <h1><a class="toc-backref" href="#id3">Development</a></h1>
errors</li>
</ul>
<pre class="code python literal-block">
<span class="c1"># flake8: noqa</span>
<span class="c1"># pylint: skip-file</span>
<span class="c1"># flake8: noqa</span><span class="w">
</span><span class="c1"># pylint: skip-file</span>
</pre>
<ul class="simple">
<li>When you want to change the code. add the following tags:</li>
</ul>
<p>For an addition:</p>
<pre class="code python literal-block">
<span class="c1"># &lt;OpenUpgrade:ADD&gt;</span>
<span class="n">some</span> <span class="n">code</span><span class="o">...</span>
<span class="c1"># &lt;/OpenUpgrade&gt;</span>
<span class="c1"># &lt;OpenUpgrade:ADD&gt;</span><span class="w">
</span><span class="n">some</span> <span class="n">code</span><span class="o">...</span><span class="w">
</span><span class="c1"># &lt;/OpenUpgrade&gt;</span>
</pre>
<p>For a change:</p>
<pre class="code python literal-block">
<span class="c1"># &lt;OpenUpgrade:CHANGE&gt;</span>
<span class="n">some</span> <span class="n">code</span><span class="o">...</span>
<span class="c1"># &lt;/OpenUpgrade&gt;</span>
<span class="c1"># &lt;OpenUpgrade:CHANGE&gt;</span><span class="w">
</span><span class="n">some</span> <span class="n">code</span><span class="o">...</span><span class="w">
</span><span class="c1"># &lt;/OpenUpgrade&gt;</span>
</pre>
<p>For a removal:</p>
<pre class="code python literal-block">
<span class="c1"># &lt;OpenUpgrade:REMOVE&gt;</span>
<span class="c1"># Comment the code, instead of removing it.</span>
<span class="c1"># &lt;/OpenUpgrade&gt;</span>
<span class="c1"># &lt;OpenUpgrade:REMOVE&gt;</span><span class="w">
</span><span class="c1"># Comment the code, instead of removing it.</span><span class="w">
</span><span class="c1"># &lt;/OpenUpgrade&gt;</span>
</pre>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id4">Bug Tracker</a></h1>
<h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/OpenUpgrade/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
If you spotted it first, help us to smash it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/OpenUpgrade/issues/new?body=module:%20openupgrade_framework%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
<h1><a class="toc-backref" href="#id5">Credits</a></h1>
<h1><a class="toc-backref" href="#toc-entry-5">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#id6">Authors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
<ul class="simple">
<li>Therp BV</li>
<li>Opener B.V.</li>
Expand All @@ -498,28 +500,28 @@ <h2><a class="toc-backref" href="#id6">Authors</a></h2>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id7">Contributors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
<ul class="simple">
<li>Stefan Rijnhart &lt;<a class="reference external" href="mailto:stefan&#64;opener.amsterdam">stefan&#64;opener.amsterdam</a>&gt;</li>
<li>Sylvain LE GAL &lt;<a class="reference external" href="https://twitter.com/legalsylvain">https://twitter.com/legalsylvain</a>&gt;</li>
</ul>
</div>
<div class="section" id="other-credits">
<h2><a class="toc-backref" href="#id8">Other credits</a></h2>
<h2><a class="toc-backref" href="#toc-entry-8">Other credits</a></h2>
<p>Many developers have contributed to the OpenUpgrade framework in its previous
incarnation. Their original contributions may no longer needed, or they are
no longer recognizable in their current form but OpenUpgrade would not have
existed at this point without them.</p>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id9">Maintainers</a></h2>
<h2><a class="toc-backref" href="#toc-entry-9">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
<p><a class="reference external" href="https://github.com/legalsylvain"><img alt="legalsylvain" src="https://github.com/legalsylvain.png?size=40px" /></a> <a class="reference external" href="https://github.com/StefanRijnhart"><img alt="StefanRijnhart" src="https://github.com/StefanRijnhart.png?size=40px" /></a> <a class="reference external" href="https://github.com/hbrunn"><img alt="hbrunn" src="https://github.com/hbrunn.png?size=40px" /></a></p>
<p><a class="reference external image-reference" href="https://github.com/legalsylvain"><img alt="legalsylvain" src="https://github.com/legalsylvain.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/StefanRijnhart"><img alt="StefanRijnhart" src="https://github.com/StefanRijnhart.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/hbrunn"><img alt="hbrunn" src="https://github.com/hbrunn.png?size=40px" /></a></p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/OpenUpgrade/tree/16.0/openupgrade_framework">OCA/OpenUpgrade</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
Expand Down
12 changes: 9 additions & 3 deletions openupgrade_scripts/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
Openupgrade Scripts
===================

.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:1e4e622a463d6aaf9a8985ff9e4dfd399e5d0d34cf47c1513ded9740a7925a43
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
Expand All @@ -19,8 +22,11 @@ Openupgrade Scripts
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/OpenUpgrade-16-0/OpenUpgrade-16-0-openupgrade_scripts
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/OpenUpgrade&target_branch=16.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4|
|badge1| |badge2| |badge3| |badge4| |badge5|

This module is a containers of migration script to migrate from 15.0 to 16.0 version.

Expand Down Expand Up @@ -54,7 +60,7 @@ Bug Tracker

Bugs are tracked on `GitHub Issues <https://github.com/OCA/OpenUpgrade/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/OpenUpgrade/issues/new?body=module:%20openupgrade_scripts%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.
Expand Down
Loading

0 comments on commit 70d514a

Please sign in to comment.