Skip to content

Commit 3c93354

Browse files
author
Hadrien Huvelle
committed
Changed odoo version to 16.0
1 parent 7c2bc52 commit 3c93354

File tree

9 files changed

+68
-36
lines changed

9 files changed

+68
-36
lines changed

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[submodule "odoo/src"]
22
path = odoo/src
33
url = [email protected]:OCA/OCB.git
4-
branch = 10.0
4+
branch = 16.0
55
[submodule "odoo/external-src/server-tools"]
66
path = odoo/external-src/server-tools
77
url = [email protected]:OCA/server-tools.git
8-
branch = 10.0
8+
branch = 16.0
99
[submodule "odoo/external-src/web"]
1010
path = odoo/external-src/web
1111
url = [email protected]:OCA/web.git
12-
branch = 10.0
12+
branch = 16.0

docker-compose.override.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ services:
1212
- 8069
1313
- 8072
1414
volumes:
15-
- "data-odoo-pytest-cache:/opt/odoo/.cache"
16-
- "./odoo/src:/opt/odoo/src"
17-
- "./odoo/local-src:/opt/odoo/local-src"
18-
- "./odoo/external-src:/opt/odoo/external-src"
19-
- "./odoo/songs:/opt/odoo/songs"
20-
- "./odoo/migration.yml:/opt/odoo/migration.yml"
21-
- "./odoo/data:/opt/odoo/data"
15+
- "data-odoo-pytest-cache:/odoo/.cache"
16+
- "./odoo/src:/odoo/src"
17+
- "./odoo/local-src:/odoo/local-src"
18+
- "./odoo/external-src:/odoo/external-src"
19+
- "./odoo/songs:/odoo/songs"
20+
- "./odoo/migration.yml:/odoo/migration.yml"
21+
- "./odoo/data:/odoo/data"
2222
environment:
2323
- MARABUNTA_MODE=demo # could be 'full' for the db with all the data
2424
- MARABUNTA_ALLOW_SERIE=True # should not be set in production

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
# - ODOO_CONNECTOR_CHANNELS=root:4
2525

2626
db:
27-
image: postgres:9.6
27+
image: ghcr.io/camptocamp/postgres:12-postgis3
2828
command: -c shared_buffers=256MB -c maintenance_work_mem=256MB -c wal_buffers=8MB -c effective_cache_size=1024MB
2929
environment:
3030
- POSTGRES_USER=odoo
@@ -33,7 +33,7 @@ services:
3333
- "data-db:/var/lib/postgresql/data"
3434

3535
nginx:
36-
image: camptocamp/odoo-nginx:9.0-1.1.0
36+
image: camptocamp/odoo-nginx:1.8.3
3737
depends_on:
3838
- odoo
3939

odoo/Dockerfile

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM camptocamp/odoo-project:10.0-2.3.0
1+
FROM camptocamp/odoo-project:15.0-latest
22
MAINTAINER Camptocamp
33

44
# Install additional debian packages if needed
@@ -10,13 +10,26 @@ MAINTAINER Camptocamp
1010
# && rm -rf /var/lib/apt/lists/*
1111

1212
# Install additional python packages if needed
13-
COPY ./*requirements.txt /opt/odoo/
14-
RUN cd /opt/odoo && find . -maxdepth 1 -name "*requirements.txt" ! -name src_requirements.txt ! -name base_requirements.txt -exec pip install -r {} \;
13+
COPY ./setup.py /odoo/
1514

16-
ENV ADDONS_PATH="/opt/odoo/external-src/server-tools, \
17-
/opt/odoo/external-src/web, \
18-
/opt/odoo/src/addons, \
19-
/opt/odoo/local-src," \
15+
## Main activity
16+
# frequency: always
17+
# costs: very high to very light
18+
COPY ./src /odoo/src
19+
COPY ./external-src /odoo/external-src
20+
COPY ./local-src /odoo/local-src
21+
COPY ./data /odoo/data
22+
COPY ./songs /odoo/songs
23+
COPY ./VERSION /odoo/
24+
COPY ./migration.yml /odoo/
25+
26+
27+
RUN cd /odoo && find . -maxdepth 1 -name "*requirements.txt" ! -name src_requirements.txt ! -name base_requirements.txt -exec pip install -r {} \;
28+
29+
ENV ADDONS_PATH="/odoo/external-src/server-tools, \
30+
/odoo/external-src/web, \
31+
/odoo/src/addons, \
32+
/odoo/local-src," \
2033
LIMIT_TIME_CPU=86400 \
2134
LIMIT_TIME_REAL=86400 \
2235
LIMIT_MEMORY_SOFT=1342177280 \

odoo/external-src/server-tools

Submodule server-tools updated 3530 files

odoo/external-src/web

Submodule web updated 2013 files

odoo/migration.yml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,31 @@
11
migration:
2-
options:
3-
install_command: odoo
42
versions:
5-
- version: 10.0.0
3+
- version: setup
4+
operations:
5+
pre:
6+
- odoo -i base --stop-after-init --workers=0 --no-xmlrpc
7+
- anthem songs.install.pre::main
8+
post:
9+
#- anthem songs.install.accounting::main
10+
#- anthem songs.install.logistics::main
11+
- anthem songs.install.data_all::main
12+
modes:
13+
full:
14+
operations:
15+
post:
16+
- anthem songs.install.data_full::main
17+
#### import heavy stuff
18+
#- importer.sh songs.install.inventory::setup_locations /odoo/data/install/stock.location.csv
19+
#- anthem songs.install.inventory::location_compute_parents
20+
sample:
21+
operations:
22+
post:
23+
- anthem songs.sample.data_sample::main
24+
addons:
25+
upgrade:
26+
- server_environment
27+
- base_technical_features
28+
- version: 16.0.0.0.0
629
operations:
730
pre:
831
- anthem songs.install.pre::main
@@ -20,5 +43,3 @@ migration:
2043
addons:
2144
upgrade:
2245
- sale
23-
- server_environment
24-
- base_technical_features

odoo/songs/install/pre.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,21 @@
44

55
import anthem
66

7-
87
@anthem.log
98
def setup_company(ctx):
10-
""" Setup company """
11-
# load logo on company
9+
"""Setup company"""
10+
1211
values = {
13-
'name': "test-odoo-project",
12+
'name': "unisante",
1413
'street': "",
1514
'zip': "",
1615
'city': "",
1716
'country_id': ctx.env.ref('base.ch').id,
1817
'phone': "+41 00 000 00 00",
19-
'fax': "+41 00 000 00 00",
20-
'email': "[email protected]",
21-
'website': "http://www.test-odoo-project.ch",
22-
'vat': "VAT",
2318
'currency_id': ctx.env.ref('base.CHF').id,
19+
'email': "[email protected]",
20+
'website': "http://www.unisante.ch",
21+
'vat': "VAT",
2422
}
2523
ctx.env.ref('base.main_company').write(values)
2624

@@ -40,4 +38,4 @@ def setup_language(ctx):
4038
def main(ctx):
4139
""" Main: creating demo data """
4240
setup_company(ctx)
43-
setup_language(ctx)
41+
#setup_language(ctx)

odoo/src

Submodule src updated from aa56adc to ba886ca

0 commit comments

Comments
 (0)