From 7cebf86286efb41edab6c1311eb267c12b26e698 Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 27 Oct 2023 11:14:22 +0200 Subject: [PATCH 1/2] sync --- .gitignore | 2 +- README.md | 2 +- snippets/fleet.fleet_vehicle_view_form.show_reservation.xml | 2 +- snippets/fleet.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ecfbd54c..c415f324 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,4 @@ dist origin.dump filestore upgraded.dump -sozialinfo +thirdparty diff --git a/README.md b/README.md index 8d612a72..472c4a13 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ task create-module addons/project_report To load modules from a thirdparty folder, set this env var in your `.env` file ``` -ODOO_ADDONS_PATH=,path/to/module/folder +ODOO_ADDONS_PATH=,thirdparty/modules/ ``` ### Docker diff --git a/snippets/fleet.fleet_vehicle_view_form.show_reservation.xml b/snippets/fleet.fleet_vehicle_view_form.show_reservation.xml index dacaf324..018ca105 100644 --- a/snippets/fleet.fleet_vehicle_view_form.show_reservation.xml +++ b/snippets/fleet.fleet_vehicle_view_form.show_reservation.xml @@ -3,7 +3,7 @@ - + diff --git a/snippets/fleet.md b/snippets/fleet.md index 2e56eb32..51e30944 100644 --- a/snippets/fleet.md +++ b/snippets/fleet.md @@ -8,7 +8,7 @@ ID: `mint_system.fleet.fleet_vehicle_view_form.show_reservation` - + From 04888750e49f41a4851e10ac0127025e573feacf Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Fri, 27 Oct 2023 19:10:10 +0200 Subject: [PATCH 2/2] update task file --- task | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/task b/task index 6427df9f..f94d9159 100755 --- a/task +++ b/task @@ -24,8 +24,8 @@ export ODOO_DEVELOPMENT_CONFIG_DIR="$HOME/.config/odoo-build" export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 -if [[ -a ".env" && "$(cat .env | sed 's/#.*//g')" ]]; then - export $(cat .env | sed 's/#.*//g' | xargs) +if [[ -a ".env" && "$(cat .env | sed 's/^#.*//g')" ]]; then + export $(cat .env | sed 's/^#.*//g' | xargs) fi function set-addons-path() {