diff --git a/.gitignore b/.gitignore index cbad49e..c7b3d78 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ odoo image_db get-poetry.py artifacts +wkhtmltox* diff --git a/CHANGELOG.md b/CHANGELOG.md index 75082ce..e68b109 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,52 @@ All notable changes to this project will be documented in this file. -The format is based on [Keep a Changelog](https://keepachangelog.com). -This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +The format is based on [Keep a Changelog](https://keepachangelog.com). This project adheres +to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [1.3.0] - 2022-01-25 + +**Migration note** + +With new version of poetry, a bug occurs in the update. The solution is to delete the directory to let it +recreate. `rm -rf ~/.poetry` + +### Added + +- Code generator supports view : activity, calendar, diagram, form, graph, kanban, pivot, search, timeline and tree +- Code generator supports portal view field and form creation +- Code generator generates generic snippets for demo_portal +- Code generator generates code_generator with code_generator_code_generator +- Code generator tests mariadb migrator +- Code generator supports javascript interpretation for snippet +- Code generator supports inheritance +- Code generator new project to create the suite of generation code +- Script to test the generation of module `code_generator` +- Make test_full_fast to run all test in parallel +- Module `web_timeline` and `web_diagram_position` in base image. +- Module `odoo-formio` from novacode-nl +- Module `design_themes` from Odoo +- Format python header with isort + +### Changed + +- Update to Python==3.7.12 +- Update to poetry==1.1.12 +- Update pip dependency with security update + - Pillow==9.0.0 + - lxml==4.7.1 + - babel==2.9.1 + - pyyaml==6.0 + - reportlab==3.6.5 +- Web diagram module has all color of the rainbow in option +- Refactor and simplify code of code_generator, better support of code reader + +### Fixed + +- Downgrade Werkzeug==0.11.15, only this version is supported by Odoo 12.0. This fixes some http request behind a proxy. + ## [1.2.1] - 2021-09-28 ### Added @@ -16,12 +57,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Changed - Update pip dependency with security update - - Jinja2==2.11.3 - - lxml==4.6.3 - - cryptography==3.4.8 - - psutil==5.6.6 - - Pillow==8.3.2 - - Werkzeug==0.15.3 + - Jinja2==2.11.3 + - lxml==4.6.3 + - cryptography==3.4.8 + - psutil==5.6.6 + - Pillow==8.3.2 + - Werkzeug==0.15.3 - Script separate generate_config.sh from install_locally.sh - Improve developer documentation - More Docker script @@ -40,22 +81,23 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm **Migration note** Because addons repository has change, config file need to be updated. + - When upgrading to version 1.2.0: - - From docker - - Clone project if only download docker-compose - - `git init` - - `git remote add origin https://github.com/erplibre/erplibre` - - `git fetch` - - `mv ./docker-compose.yml /tmp/temp_docker-compose.yml` - - `git checkout master` - - `mv /tmp/temp_docker-compose.yml ./docker-compose.yml` - - Update `./docker-compose.yml` depending of difference with git. - - Run script `make docker_exec_erplibre_gen_config` - - Restart the docker `make docker_restart_daemon` - - From vanilla - - Run script `make install_dev` - - Restart your daemon - - Regenerate master password manually + - From docker + - Clone project if only download docker-compose + - `git init` + - `git remote add origin https://github.com/erplibre/erplibre` + - `git fetch` + - `mv ./docker-compose.yml /tmp/temp_docker-compose.yml` + - `git checkout master` + - `mv /tmp/temp_docker-compose.yml ./docker-compose.yml` + - Update `./docker-compose.yml` depending of difference with git. + - Run script `make docker_exec_erplibre_gen_config` + - Restart the docker `make docker_restart_daemon` + - From vanilla + - Run script `make install_dev` + - Restart your daemon + - Regenerate master password manually ### Added @@ -67,9 +109,9 @@ Because addons repository has change, config file need to be updated. - Improve git repo usage, filter repo by use case - ERPLibre theme website of TechnoLibre - ERPLibre website snippet - - Basic HTML snippets - - Snippet card - - Snippet timelines + - Basic HTML snippets + - Snippet card + - Snippet timelines - Module contract_digitized_signature with contract_portal - Module disable auto_backup - Odoo cli db command to manipulate restoration db @@ -97,7 +139,8 @@ Because addons repository has change, config file need to be updated. - Format all Python code with black - Module auto_backup with sftp host key - Module muk_website_branding use ERPLibre branding -- Update docs with vscode support, custom document layout, custom email template and trick to use params to share variable +- Update docs with vscode support, custom document layout, custom email template and trick to use params to share + variable #### Docker @@ -211,7 +254,9 @@ Because addons repository has change, config file need to be updated. - Support only python3.6 and python3.7, python3.8 causes error in runtime. -[Unreleased]: https://github.com/ERPLibre/ERPLibre/compare/v1.2.1...HEAD +[Unreleased]: https://github.com/ERPLibre/ERPLibre/compare/v1.3.0...HEAD + +[1.3.0]: https://github.com/ERPLibre/ERPLibre/compare/v1.2.1...v1.3.0 [1.2.1]: https://github.com/ERPLibre/ERPLibre/compare/v1.2.0...v1.2.1 diff --git a/README.md b/README.md index 4ac9a2d..96c727f 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ First, install dependencies to run docker, check script `./script/install_ubuntu The docker volume is binded to the directory name, therefore create a unique directory name and run: ```bash -wget https://raw.githubusercontent.com/ERPLibre/ERPLibre/v1.2.1/docker-compose.yml +wget https://raw.githubusercontent.com/ERPLibre/ERPLibre/v1.3.0/docker-compose.yml docker-compose up -d ``` diff --git a/default.xml b/default.xml index b952978..19d27d5 100644 --- a/default.xml +++ b/default.xml @@ -13,6 +13,7 @@ + @@ -23,7 +24,7 @@ - + @@ -59,6 +60,7 @@ + @@ -85,7 +87,7 @@ - + @@ -93,14 +95,15 @@ - - + + + - + @@ -133,12 +136,12 @@ - - + + - + @@ -148,7 +151,7 @@ - + diff --git a/doc/RELEASE.md b/doc/RELEASE.md index 89f4436..3d73c39 100644 --- a/doc/RELEASE.md +++ b/doc/RELEASE.md @@ -124,7 +124,7 @@ Simplification tools: ```bash # Show all divergence repository with production make repo_diff_manifest_production -# Short version with statistique +# Short version with statistics make repo_diff_stat_from_last_version # Long version make repo_diff_from_last_version diff --git a/docker-compose.yml b/docker-compose.yml index 1492b13..b6b7770 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,43 +1,43 @@ version: "3.3" services: - ERPLibre: - image: technolibre/erplibre:1.2.1 - ports: - - 8069:8069 - - 8071:8071 - - 8072:8072 - environment: - HOST: db - PASSWORD: mysecretpassword - USER: odoo - POSTGRES_DB: postgres - STOP_BEFORE_INIT: "False" - DB_NAME: "" - UPDATE_ALL_DB: "False" - depends_on: - - db - # not behind a proxy - #command: odoo --workers 0 - # behind a proxy - #command: odoo --workers 2 - command: odoo - volumes: - # See the volume section at the end of the file - - erplibre_data_dir:/home/odoo/.local/share/Odoo - - ./addons/addons:/ERPLibre/addons/addons - - erplibre_conf:/etc/odoo - restart: always + ERPLibre: + image: technolibre/erplibre:1.3.0 + ports: + - 8069:8069 + - 8071:8071 + - 8072:8072 + environment: + HOST: db + PASSWORD: mysecretpassword + USER: odoo + POSTGRES_DB: postgres + STOP_BEFORE_INIT: "False" + DB_NAME: "" + UPDATE_ALL_DB: "False" + depends_on: + - db + # not behind a proxy + #command: odoo --workers 0 + # behind a proxy + #command: odoo --workers 2 + command: odoo + volumes: + # See the volume section at the end of the file + - erplibre_data_dir:/home/odoo/.local/share/Odoo + - ./addons/addons:/ERPLibre/addons/addons + - erplibre_conf:/etc/odoo + restart: always - db: - image: postgis/postgis:12-3.1-alpine - environment: - POSTGRES_PASSWORD: mysecretpassword - POSTGRES_USER: odoo - POSTGRES_DB: postgres - PGDATA: /var/lib/postgresql/data/pgdata - volumes: - - erplibre-db-data:/var/lib/postgresql/data/pgdata - restart: always + db: + image: postgis/postgis:12-3.1-alpine + environment: + POSTGRES_PASSWORD: mysecretpassword + POSTGRES_USER: odoo + POSTGRES_DB: postgres + PGDATA: /var/lib/postgresql/data/pgdata + volumes: + - erplibre-db-data:/var/lib/postgresql/data/pgdata + restart: always # We configure volume without specific destination to let docker manage it. To configure it through docker use (read related documentation before continuing) : # - docker volume --help diff --git a/docker/Dockerfile.prod.pkg b/docker/Dockerfile.prod.pkg index e7d7e82..b413caf 100644 --- a/docker/Dockerfile.prod.pkg +++ b/docker/Dockerfile.prod.pkg @@ -1,4 +1,4 @@ -FROM technolibre/erplibre-base:1.2.1 +FROM technolibre/erplibre-base:1.3.0 ENV REPO_MANIFEST_URL https://github.com/ERPLibre/ERPLibre ARG WORKING_BRANCH @@ -34,16 +34,16 @@ RUN cd $ODOO_PREFIX && \ RUN cd $ODOO_PREFIX && \ ./script/update_manifest_dev.sh -# TODO delete poetry installation # Install Poetry RUN cd $ODOO_PREFIX && \ curl -sSL -o get-poetry.py https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py && \ - ./.venv/bin/python get-poetry.py -y --preview --version 1.0.10 + ./.venv/bin/python get-poetry.py -y --preview --version 1.1.12 RUN cd $ODOO_PREFIX && \ ./.venv/bin/pip install --upgrade pip && \ ./.venv/bin/python ~/.poetry/bin/poetry install && \ - rm -rf artifacts + rm -rf artifacts && \ + rm -rf ~/.poetry RUN cd $ODOO_PREFIX/.venv && \ curl https://raw.githubusercontent.com/ERPLibre/multilingual-markdown/master/multilang_md.py > ./multilang_md.py && \ diff --git a/docker/README.md b/docker/README.md index 8b78e64..a0f63e0 100644 --- a/docker/README.md +++ b/docker/README.md @@ -121,3 +121,7 @@ List your docker version You need to push your docker image and update your tag, like 1.0.1: > docker push technolibre/erplibre:VERSION + +# Diagnostic +When getting and error about missing module, or after an upgrade, you need to update config file. +> make docker_exec_erplibre_gen_config diff --git a/env_var.sh b/env_var.sh index 285443c..88e7601 100755 --- a/env_var.sh +++ b/env_var.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -ERPLIBRE_VERSION="1.2.1" +ERPLIBRE_VERSION="1.3.0" EL_USER="erplibre" EL_HOME="/${EL_USER}" diff --git a/pyproject.toml b/pyproject.toml index 62eb157..657fbc7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = [ "poetry>=1.0.0",] +requires = [ "poetry>=1.1.12",] build-backend = "poetry.masonry.api" [tool.isort] @@ -12,7 +12,7 @@ target-version = [ "py37",] [tool.poetry] name = "ERPLibre" -version = "1.2.1" +version = "1.3.0" description = "Easy way to configure Odoo community" license = "AGPL-3.0-or-later" authors = [ "Mathieu Benoit ",] diff --git a/script/install_locally.sh b/script/install_locally.sh index db1b037..ca5298f 100755 --- a/script/install_locally.sh +++ b/script/install_locally.sh @@ -109,7 +109,7 @@ ${VENV_PATH}/bin/pip install --upgrade pip # Force python instead of changing env #/home/"${USER}"/.poetry/bin/poetry env use ${LOCAL_PYTHON_EXEC} # source $HOME/.poetry/env -${LOCAL_PYTHON_EXEC} ~/.poetry/bin/poetry env use ${VENV_PATH}/bin/python3 +#${LOCAL_PYTHON_EXEC} ~/.poetry/bin/poetry env use ${VENV_PATH}/bin/python3 ${LOCAL_PYTHON_EXEC} ~/.poetry/bin/poetry install retVal=$? if [[ $retVal -ne 0 ]]; then diff --git a/script/install_locally_dev.sh b/script/install_locally_dev.sh index 81160aa..2dd081b 100755 --- a/script/install_locally_dev.sh +++ b/script/install_locally_dev.sh @@ -26,6 +26,6 @@ pip install setuptools-rust # Delete all tag before installing, or break installation, will generate a new one after git tag | xargs git tag -d python setup.py install -git tag ERPLibre/v1.2.1 +git tag ERPLibre/v1.3.0 #${VENV_PATH}/bin/pip install ./script/OCA_maintainer-tools/ cd -