Merge branch '16.0' of github.com:Mint-System/Odoo-Development into 16.0
This commit is contained in:
commit
571bcd2425
5 files changed
+6
-6
No files matched your search
+1
-1
@@ -22,4 +22,4 @@ dist
|
||||
origin.dump
|
||||
filestore
|
||||
upgraded.dump
|
||||
sozialinfo
|
||||
thirdparty
|
||||
@@ -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
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
<xpath expr="//group/group[5]" position="after">
|
||||
<group string="Reservation">
|
||||
<field name="reserved_time">
|
||||
<field name="reserved_ids">
|
||||
<tree>
|
||||
<field name="date_from" />
|
||||
<field name="date_to" />
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ ID: `mint_system.fleet.fleet_vehicle_view_form.show_reservation`
|
||||
|
||||
<xpath expr="//group/group[5]" position="after">
|
||||
<group string="Reservation">
|
||||
<field name="reserved_time">
|
||||
<field name="reserved_ids">
|
||||
<tree>
|
||||
<field name="date_from" />
|
||||
<field name="date_to" />
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in new issue
Block a user