From bcf1cfb5d0ef653e014db13bc82b89774257bf54 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Tue, 29 Sep 2020 19:43:42 -0400 Subject: [PATCH] Release v1.1.0 --- CHANGELOG.md | 24 +++- default.xml | 239 ++++++++++++++++++++++--------------- docker-compose.yml | 2 +- docker/Dockerfile.prod.pkg | 2 +- env_var.sh | 2 +- 5 files changed, 163 insertions(+), 106 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7704548..b2e4c19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,19 +5,33 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [1.1.0] - 2020-09-30 ### Added - Docker +- Pyenv to manage python version +- Poetry to manage python dependencies + - Script poetry_update to search all dependencies in addons +- Travis CI WIP +- TODO.md +- Guide to update all repositories with community +- Update manifest + - Add missing OCA repos + - Add medical, property management and more + - Add cloud/saas repo ### Changed -- Update to Odoo Community 12.0 +- Update to Odoo Community 12.0 and all addons +- Rename venv to .venv +- More documentation on how to use ERPLibre ## [1.0.1] - 2020-07-14 ### Added -- Improve documentation with development and production environment -- Improve documentation with git repo +- Improved documentation with development and production environment +- Improved documentation with git repo - Move default.xml manifest to root, the default location - Support default.stage.xml to update prod with dev -- Feature to show diff between manifest, between repo of different manifest +- Feature to show diff between manifests or between repo of different manifests - Update manifest - Muk theme in erplibre_base - Add draft account invoice approbation in portal @@ -31,7 +45,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.0.0] - 2020-07-04 ### Added - Environment of development, discovery and production with documentation and script. -- git-repo of Google to support addons repository instead of using Git submodule. +- Google git-repo to support addons repository instead of using Git submodule. ### Removed - Git submodule diff --git a/default.xml b/default.xml index 1396a65..427b8fc 100644 --- a/default.xml +++ b/default.xml @@ -1,103 +1,146 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docker-compose.yml b/docker-compose.yml index e96f347..44203f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.3" services: ERPLibre: - image: technolibre/erplibre:1.0.1 + image: technolibre/erplibre:1.1.0 ports: - 8069:8069 - 8071:8071 diff --git a/docker/Dockerfile.prod.pkg b/docker/Dockerfile.prod.pkg index 15f514b..78820ca 100644 --- a/docker/Dockerfile.prod.pkg +++ b/docker/Dockerfile.prod.pkg @@ -1,4 +1,4 @@ -FROM technolibre/erplibre-base:1.0.1 +FROM technolibre/erplibre-base:1.1.0 ENV REPO_MANIFEST_URL http://git.erplibre.ca/ERPLibre ARG WORKING_BRANCH diff --git a/env_var.sh b/env_var.sh index a1c1af7..1979a9e 100755 --- a/env_var.sh +++ b/env_var.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -ERPLIBRE_VERSION="1.0.1" +ERPLIBRE_VERSION="1.1.0" ERPLIBRE_DOCKER_BASE="technolibre/erplibre-base" ERPLIBRE_DOCKER_PROD="technolibre/erplibre" ERPLIBRE_DOCKER_BASE_VERSION="${ERPLIBRE_DOCKER_BASE}:${ERPLIBRE_VERSION}"