commit
0505fa7668
12 changed files with 138 additions and 85 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -20,3 +20,4 @@ odoo
|
|||
image_db
|
||||
get-poetry.py
|
||||
artifacts
|
||||
wkhtmltox*
|
||||
|
|
|
|||
101
CHANGELOG.md
101
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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
```
|
||||
|
||||
|
|
|
|||
21
default.xml
21
default.xml
|
|
@ -13,6 +13,7 @@
|
|||
<remote fetch="https://github.com/ERPLibre/" name="itpp-labs"/>
|
||||
<remote fetch="https://github.com/ERPLibre/" name="kinjal-sorathiya"/>
|
||||
<remote fetch="https://github.com/ERPLibre/" name="muk-it"/>
|
||||
<remote fetch="https://github.com/ERPLibre/" name="novacode-nl"/>
|
||||
<remote fetch="https://github.com/ERPLibre/" name="obayit"/>
|
||||
<remote fetch="https://github.com/ERPLibre/" name="odoo"/>
|
||||
<remote fetch="https://github.com/ERPLibre/" name="odooaktiv"/>
|
||||
|
|
@ -23,7 +24,7 @@
|
|||
|
||||
<default remote="ERPLibre" revision="12.0" sync-c="true" sync-j="4"/>
|
||||
|
||||
<project clone-depth="1" dest-branch="12.0" groups="base" name="ERPLibre_image_db.git" path="image_db" revision="890013f62132c5c8779a4ef63b820c47a7694b2f" upstream="12.0"/>
|
||||
<project clone-depth="1" dest-branch="12.0" groups="base" name="ERPLibre_image_db.git" path="image_db" revision="a98d056d751cfb273fde66866db6ff1ff6831991" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons" name="OpenHRMS.git" path="addons/CybroOdoo_OpenHRMS" remote="CybroOdoo" revision="e7881872d147e91a59e9ee9fac9e89316e1cabb4" upstream="12.0"/>
|
||||
<project dest-branch="master" groups="addons" name="Property-Management_odoo.git" path="addons/kinjal-sorathiya_Property-Management_odoo" remote="kinjal-sorathiya" revision="922f6878ac560829d2ebe951b93f858c1e7d256d" upstream="master"/>
|
||||
<project dest-branch="12.0" groups="addons" name="QuotationRevision.git" path="addons/odooaktiv_QuotationRevision" remote="odooaktiv" revision="701438f9c59bd657de516d9ef4de1ba6167bf30b" upstream="12.0"/>
|
||||
|
|
@ -59,6 +60,7 @@
|
|||
<project dest-branch="12.0" groups="addons" name="ddmrp.git" path="addons/OCA_ddmrp" remote="OCA" revision="f4f2f920c091caef4bf0b55c6e1a98ed333afa25" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons" name="delivery-carrier.git" path="addons/OCA_delivery-carrier" remote="OCA" revision="92a8b4445400a2ee76ed4ea9c9fe83a57a2aaeab" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons" name="deltatech.git" path="addons/dhongu_deltatech" remote="dhongu" revision="70ad7f4f9981896e04117156732ac0056764031c" upstream="12.0"/>
|
||||
<project dest-branch="12.0_dev" groups="addons,code_generator,image_db" name="design-themes.git" path="addons/odoo_design-themes" remote="odoo" revision="59522be3eb1b82a959ba640e59bd1225f6ba8383" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0" groups="addons,base" name="development.git" path="addons/MathBenTech_development" remote="MathBenTech" revision="66e17f1be83ef79c1c2ad13c001aab07c6a5d36d" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="odoo" name="documentation-user.git" path="doc/odoo_documentation-user" remote="odoo" revision="34310a683b498768d5543839a72ceadd4a9120a7" upstream="12.0"/>
|
||||
<project dest-branch="12.0_module_donation_website" groups="addons" name="donation.git" path="addons/OCA_donation" remote="OCA" revision="66a80b99c17baaa82df76d51bd3fd9bc3163034a" upstream="12.0_module_donation_website"/>
|
||||
|
|
@ -85,7 +87,7 @@
|
|||
<project dest-branch="12.0_dev" groups="addons,base" name="muk_base.git" path="addons/muk-it_muk_base" remote="muk-it" revision="395c178964b5c7f547e5d36d5b6e78bd58481f56" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0" groups="addons" name="muk_dms.git" path="addons/muk-it_muk_dms" remote="muk-it" revision="346b2d742696343ee025083604ee6fcb2050a65b" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons" name="muk_docs.git" path="addons/muk-it_muk_docs" remote="muk-it" revision="a8ea02b9f00ae9fe5d2ea25ac43d23532cc11d45" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons,base" name="muk_misc.git" path="addons/muk-it_muk_misc" remote="muk-it" revision="37b9d6dc20fa686a323057b160015bfc2c2c8143" upstream="12.0"/>
|
||||
<project dest-branch="12.0_dev" groups="addons,base" name="muk_misc.git" path="addons/muk-it_muk_misc" remote="muk-it" revision="96ba7bf37672a64a6e8f86d4e0ce0050888e6cd1" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0" groups="addons" name="muk_quality.git" path="addons/muk-it_muk_quality" remote="muk-it" revision="1a4c6f25c5e4fe0029d406d6283555bd23a44d27" upstream="12.0"/>
|
||||
<project dest-branch="12.0_dev" groups="addons,base" name="muk_web.git" path="addons/muk-it_muk_web" remote="muk-it" revision="89018ef54942ed958b10a3fb5a4e63a84ced8095" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0_remove_autoinstall" groups="addons,base" name="muk_website.git" path="addons/muk-it_muk_website" remote="muk-it" revision="c6c42a4b7187f8964675d004e478e2251f2cdde9" upstream="12.0_remove_autoinstall"/>
|
||||
|
|
@ -93,14 +95,15 @@
|
|||
<project dest-branch="12.0_dev" groups="addons" name="odoo-base-addons.git" path="addons/Numigi_odoo-base-addons" remote="Numigi" revision="78c23a29283f35ef480186358dd6d848a38a2aff" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0_sale_order_line_timesheet_attribution" groups="addons,base" name="odoo-business-spending-management-quebec-canada.git" path="addons/MathBenTech_odoo-business-spending-management-quebec-canada" remote="MathBenTech" revision="822d2e018554119fa63f79ac91625473ec54b9fe" upstream="12.0_sale_order_line_timesheet_attribution"/>
|
||||
<project dest-branch="12.0_dev" groups="addons" name="odoo-cloud-platform.git" path="addons/camptocamp_odoo-cloud-platform" remote="camptocamp" revision="66ab5ab453d38f480bd8b07c54b9925e25e9890b" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0" groups="addons,code_generator,image_db" name="odoo-code-generator-template.git" path="addons/TechnoLibre_odoo-code-generator-template" remote="TechnoLibre" revision="57e09628115f8fa8868fd4006e41d68ccb595c0f" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons,code_generator,image_db" name="odoo-code-generator.git" path="addons/TechnoLibre_odoo-code-generator" remote="TechnoLibre" revision="256d298b0638eb00cc88e875530c1f394ff0d7f2" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons,code_generator,image_db" name="odoo-code-generator-template.git" path="addons/TechnoLibre_odoo-code-generator-template" remote="TechnoLibre" revision="a5ea5910398a42f79c3d4612c237a02ccc486348" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons,code_generator,image_db" name="odoo-code-generator.git" path="addons/TechnoLibre_odoo-code-generator" remote="TechnoLibre" revision="73ec6836ff3fcefd8b632bcddf9a53de9ccf31b3" upstream="12.0"/>
|
||||
<project dest-branch="12.0_dev" groups="odoo" name="odoo-development.git" path="doc/itpp-labs_odoo-development" remote="itpp-labs" revision="388bc9b618a0e7ccf970fc678028f19b146e65f9" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0_dev" groups="addons" name="odoo-entertainment-addons.git" path="addons/Numigi_odoo-entertainment-addons" remote="Numigi" revision="5abba3eabcb60c96d80240ab756736eb57ed345b" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0" groups="addons" name="odoo-formio.git" path="addons/novacode-nl_odoo-formio" remote="novacode-nl" revision="4bc32badf164383f98340d95c1681c3594b1ea94" upstream="12.0"/>
|
||||
<project dest-branch="12.0_dev" groups="addons" name="odoo-git-addons.git" path="addons/Numigi_odoo-git-addons" remote="Numigi" revision="a394f422a5d3063dd2c339544ecca74bdbbe19ae" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0" groups="addons" name="odoo-hr-addons.git" path="addons/Numigi_odoo-hr-addons" remote="Numigi" revision="2d3dd1769b47aac54585c56dcad652a4dbe5850f" upstream="12.0"/>
|
||||
<project dest-branch="master" groups="odoo" name="odoo-module-migrator.git" path="script/OCA_odoo-module-migrator" remote="OCA" revision="a9974dd4252d098590f8694f283aafac7a2b5278" upstream="master"/>
|
||||
<project dest-branch="12.0_dev" groups="addons,image_db" name="odoo-partner-addons.git" path="addons/Numigi_odoo-partner-addons" remote="Numigi" revision="3320fbed43c324d07035f7f1d1bc77d779f8fe0e" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0_dev" groups="addons,base,image_db" name="odoo-partner-addons.git" path="addons/Numigi_odoo-partner-addons" remote="Numigi" revision="3320fbed43c324d07035f7f1d1bc77d779f8fe0e" upstream="12.0_dev"/>
|
||||
<project dest-branch="master" groups="odoo" name="odoo-port-docs.git" path="doc/itpp-labs_odoo-port-docs" remote="itpp-labs" revision="25ded087e996dfa0244563d797060c34c11f981d" upstream="master"/>
|
||||
<project dest-branch="12.0_dev" groups="addons" name="odoo-product-addons.git" path="addons/Numigi_odoo-product-addons" remote="Numigi" revision="e4daf4cb743dd73928571c0757083e8ee6fec6ef" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0" groups="addons" name="odoo-product-configurator.git" path="addons/pledra_odoo-product-configurator" remote="pledra" revision="785923c83266097f53569769c26c8f2a859d1d6f" upstream="12.0"/>
|
||||
|
|
@ -133,12 +136,12 @@
|
|||
<project dest-branch="12.0" groups="addons" name="saas-addons.git" path="addons/it-projects-llc_saas-addons" remote="it-projects-llc" revision="b03699e438366bb8df292ef6486ef7473cf15e34" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons" name="sale-reporting.git" path="addons/OCA_sale-reporting" remote="OCA" revision="10224ef7b42ee3dec2849414e41557b0bc3c8f79" upstream="12.0"/>
|
||||
<project dest-branch="12.0_modules_sale_order_line" groups="addons" name="sale-workflow.git" path="addons/OCA_sale-workflow" remote="OCA" revision="5d8d2575e6a2c8ad0e3315abd0585651f73b80fd" upstream="12.0_modules_sale_order_line"/>
|
||||
<project dest-branch="12.0_dev" groups="addons" name="scrummer.git" path="addons/MathBenTech_scrummer" remote="MathBenTech" revision="38c04c8f7b7fe897d166ded74dda9d8d76f7f4c4" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0" groups="addons" name="server-auth.git" path="addons/OCA_server-auth" remote="OCA" revision="2bfb2b2f64bda15fb5c7f8f4d528aa1aadc4998b" upstream="12.0"/>
|
||||
<project dest-branch="12.0_dev" groups="addons,base" name="scrummer.git" path="addons/MathBenTech_scrummer" remote="MathBenTech" revision="aea2c8de8743cddbdd9cd31205af6c690253c715" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0" groups="addons,base,image_db" name="server-auth.git" path="addons/OCA_server-auth" remote="OCA" revision="2bfb2b2f64bda15fb5c7f8f4d528aa1aadc4998b" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons" name="server-backend.git" path="addons/OCA_server-backend" remote="OCA" revision="77a1ee79912d381e06c8bd96f1034574b460881d" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons,base" name="server-brand.git" path="addons/OCA_server-brand" remote="OCA" revision="786a26c58f789ed63e6380d5e550cf300a5ae1a4" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons" name="server-env.git" path="addons/OCA_server-env" remote="OCA" revision="11d6745d4156636dd12d134a9b3f8053cb24717b" upstream="12.0"/>
|
||||
<project dest-branch="12.0_dev" groups="addons,base" name="server-tools.git" path="addons/OCA_server-tools" remote="OCA" revision="27835ae75e9679750b433fdc4756771b8fff7997" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0_dev" groups="addons,base" name="server-tools.git" path="addons/OCA_server-tools" remote="OCA" revision="76328d8bdab4870f74cdfb4b7632109e24ffebbd" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0" groups="addons" name="server-ux.git" path="addons/OCA_server-ux" remote="OCA" revision="765439a6af66be5ee2427a2775812d44a345a235" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons,base" name="social.git" path="addons/OCA_social" remote="OCA" revision="8bd98212b8d04aa3de82e9f51063b9d185ac0f1c" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons" name="stock-logistics-warehouse.git" path="addons/OCA_stock-logistics-warehouse" remote="OCA" revision="1b99507da7815d1dd2e030a3a1d28285ea7ecf76" upstream="12.0"/>
|
||||
|
|
@ -148,7 +151,7 @@
|
|||
<project dest-branch="12.0" groups="addons" name="vertical-hotel.git" path="addons/OCA_vertical-hotel" remote="OCA" revision="f958379e1492870431a92543089db214b62ab1f5" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons" name="vertical-isp.git" path="addons/OCA_vertical-isp" remote="OCA" revision="28ad39aae5eb5cebaa46d79ce563ef760451962b" upstream="12.0"/>
|
||||
<project dest-branch="12.0" groups="addons" name="vertical-travel.git" path="addons/OCA_vertical-travel" remote="OCA" revision="3572c0689eb67a757681070ac913c72cea50645f" upstream="12.0"/>
|
||||
<project dest-branch="12.0_dev" groups="addons,base" name="web.git" path="addons/OCA_web" remote="OCA" revision="2c57ad38475f030dbd00c01d00c6a540d5ab4d7d" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0_dev" groups="addons,base" name="web.git" path="addons/OCA_web" remote="OCA" revision="69d2842f9266ff0e61bdee9e02f597975a6b6a3c" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0_dev" groups="addons" name="website-addons.git" path="addons/itpp-labs_website-addons" remote="itpp-labs" revision="ed7d3b19435d7522afccf17edd9261ab215b4851" upstream="12.0_dev"/>
|
||||
<project dest-branch="12.0" groups="addons" name="website-cms.git" path="addons/OCA_website-cms" remote="OCA" revision="e67368d15de06e795247bd54874181bfd7324a44" upstream="12.0"/>
|
||||
<project dest-branch="12.0_dev" groups="addons,code_generator,image_db" name="website.git" path="addons/OCA_website" remote="OCA" revision="900919e8fbe155ebf58273870f0fb596f317f6c4" upstream="12.0_dev"/>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 && \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}"
|
||||
|
|
|
|||
|
|
@ -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 <mathben@technolibre.ca>",]
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 -
|
||||
|
|
|
|||
Loading…
Reference in a new issue