diff --git a/.gitignore b/.gitignore index 118203d..847fc62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ .env config/odoo.conf +config/odoo18.conf +odoo18/ +enterprise/ *.log .DS_Store diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..50bda3b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,27 @@ +FROM odoo:18 + +USER root + +# Install extra system packages if needed +RUN apt-get update && apt-get install -y \ + git \ + python3-pip \ + python3-dev \ + build-essential \ + libldap2-dev \ + libsasl2-dev \ + libssl-dev \ + && rm -rf /var/lib/apt/lists/* + +# Copy Odoo source requirements +#COPY ./odoo18/requirements.txt /tmp/requirements.txt + +# Install Python dependencies +#RUN pip3 install --break-system-packages -r /tmp/requirements.txt + +# Create working directory +WORKDIR /opt/odoo + +USER odoo + +CMD ["python3", "/opt/odoo/odoo-bin", "-c", "/etc/odoo/odoo.conf"] diff --git a/addons/kosbar_erp_ext/__init__.py b/custom_addons/kosbar_erp_ext/__init__.py similarity index 100% rename from addons/kosbar_erp_ext/__init__.py rename to custom_addons/kosbar_erp_ext/__init__.py diff --git a/addons/kosbar_erp_ext/__manifest__.py b/custom_addons/kosbar_erp_ext/__manifest__.py similarity index 100% rename from addons/kosbar_erp_ext/__manifest__.py rename to custom_addons/kosbar_erp_ext/__manifest__.py diff --git a/addons/kosbar_erp_ext/data/ir_sequence.xml b/custom_addons/kosbar_erp_ext/data/ir_sequence.xml similarity index 100% rename from addons/kosbar_erp_ext/data/ir_sequence.xml rename to custom_addons/kosbar_erp_ext/data/ir_sequence.xml diff --git a/addons/kosbar_erp_ext/data/stock_picking_type.xml b/custom_addons/kosbar_erp_ext/data/stock_picking_type.xml similarity index 100% rename from addons/kosbar_erp_ext/data/stock_picking_type.xml rename to custom_addons/kosbar_erp_ext/data/stock_picking_type.xml diff --git a/addons/kosbar_erp_ext/models/__init__.py b/custom_addons/kosbar_erp_ext/models/__init__.py similarity index 100% rename from addons/kosbar_erp_ext/models/__init__.py rename to custom_addons/kosbar_erp_ext/models/__init__.py diff --git a/addons/kosbar_erp_ext/models/__pycache__/sale_order.cpython-314.pyc b/custom_addons/kosbar_erp_ext/models/__pycache__/sale_order.cpython-314.pyc similarity index 100% rename from addons/kosbar_erp_ext/models/__pycache__/sale_order.cpython-314.pyc rename to custom_addons/kosbar_erp_ext/models/__pycache__/sale_order.cpython-314.pyc diff --git a/addons/kosbar_erp_ext/models/product_category.py b/custom_addons/kosbar_erp_ext/models/product_category.py similarity index 100% rename from addons/kosbar_erp_ext/models/product_category.py rename to custom_addons/kosbar_erp_ext/models/product_category.py diff --git a/addons/kosbar_erp_ext/models/product_product.py b/custom_addons/kosbar_erp_ext/models/product_product.py similarity index 100% rename from addons/kosbar_erp_ext/models/product_product.py rename to custom_addons/kosbar_erp_ext/models/product_product.py diff --git a/addons/kosbar_erp_ext/models/product_template.py b/custom_addons/kosbar_erp_ext/models/product_template.py similarity index 100% rename from addons/kosbar_erp_ext/models/product_template.py rename to custom_addons/kosbar_erp_ext/models/product_template.py diff --git a/addons/kosbar_erp_ext/models/sale_order.py b/custom_addons/kosbar_erp_ext/models/sale_order.py similarity index 100% rename from addons/kosbar_erp_ext/models/sale_order.py rename to custom_addons/kosbar_erp_ext/models/sale_order.py diff --git a/addons/kosbar_erp_ext/models/stock_picking.py b/custom_addons/kosbar_erp_ext/models/stock_picking.py similarity index 100% rename from addons/kosbar_erp_ext/models/stock_picking.py rename to custom_addons/kosbar_erp_ext/models/stock_picking.py diff --git a/addons/kosbar_erp_ext/references/custom-product-code.md b/custom_addons/kosbar_erp_ext/references/custom-product-code.md similarity index 100% rename from addons/kosbar_erp_ext/references/custom-product-code.md rename to custom_addons/kosbar_erp_ext/references/custom-product-code.md diff --git a/addons/kosbar_erp_ext/security/ir.model.access.csv b/custom_addons/kosbar_erp_ext/security/ir.model.access.csv similarity index 100% rename from addons/kosbar_erp_ext/security/ir.model.access.csv rename to custom_addons/kosbar_erp_ext/security/ir.model.access.csv diff --git a/addons/kosbar_erp_ext/security/res_groups.xml b/custom_addons/kosbar_erp_ext/security/res_groups.xml similarity index 100% rename from addons/kosbar_erp_ext/security/res_groups.xml rename to custom_addons/kosbar_erp_ext/security/res_groups.xml diff --git a/addons/kosbar_erp_ext/views/product_views.xml b/custom_addons/kosbar_erp_ext/views/product_views.xml similarity index 100% rename from addons/kosbar_erp_ext/views/product_views.xml rename to custom_addons/kosbar_erp_ext/views/product_views.xml diff --git a/addons/kosbar_purchase_finance/__init__.py b/custom_addons/kosbar_purchase_finance/__init__.py similarity index 100% rename from addons/kosbar_purchase_finance/__init__.py rename to custom_addons/kosbar_purchase_finance/__init__.py diff --git a/addons/kosbar_purchase_finance/__manifest__.py b/custom_addons/kosbar_purchase_finance/__manifest__.py similarity index 100% rename from addons/kosbar_purchase_finance/__manifest__.py rename to custom_addons/kosbar_purchase_finance/__manifest__.py diff --git a/addons/kosbar_purchase_finance/data/ir_sequence.xml b/custom_addons/kosbar_purchase_finance/data/ir_sequence.xml similarity index 100% rename from addons/kosbar_purchase_finance/data/ir_sequence.xml rename to custom_addons/kosbar_purchase_finance/data/ir_sequence.xml diff --git a/addons/kosbar_purchase_finance/models/__init__.py b/custom_addons/kosbar_purchase_finance/models/__init__.py similarity index 100% rename from addons/kosbar_purchase_finance/models/__init__.py rename to custom_addons/kosbar_purchase_finance/models/__init__.py diff --git a/addons/kosbar_purchase_finance/models/purchase_order.py b/custom_addons/kosbar_purchase_finance/models/purchase_order.py similarity index 100% rename from addons/kosbar_purchase_finance/models/purchase_order.py rename to custom_addons/kosbar_purchase_finance/models/purchase_order.py diff --git a/addons/kosbar_purchase_finance/models/purchase_request.py b/custom_addons/kosbar_purchase_finance/models/purchase_request.py similarity index 100% rename from addons/kosbar_purchase_finance/models/purchase_request.py rename to custom_addons/kosbar_purchase_finance/models/purchase_request.py diff --git a/addons/kosbar_purchase_finance/security/ir.model.access.csv b/custom_addons/kosbar_purchase_finance/security/ir.model.access.csv similarity index 100% rename from addons/kosbar_purchase_finance/security/ir.model.access.csv rename to custom_addons/kosbar_purchase_finance/security/ir.model.access.csv diff --git a/addons/kosbar_purchase_finance/security/res_groups.xml b/custom_addons/kosbar_purchase_finance/security/res_groups.xml similarity index 100% rename from addons/kosbar_purchase_finance/security/res_groups.xml rename to custom_addons/kosbar_purchase_finance/security/res_groups.xml diff --git a/addons/kosbar_purchase_finance/views/purchase_order_views.xml b/custom_addons/kosbar_purchase_finance/views/purchase_order_views.xml similarity index 100% rename from addons/kosbar_purchase_finance/views/purchase_order_views.xml rename to custom_addons/kosbar_purchase_finance/views/purchase_order_views.xml diff --git a/addons/kosbar_purchase_finance/views/purchase_request_views.xml b/custom_addons/kosbar_purchase_finance/views/purchase_request_views.xml similarity index 100% rename from addons/kosbar_purchase_finance/views/purchase_request_views.xml rename to custom_addons/kosbar_purchase_finance/views/purchase_request_views.xml diff --git a/docker-compose.yml b/docker-compose.yml index ade2057..3b46445 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: db: image: postgres:16 @@ -12,6 +10,8 @@ services: - POSTGRES_DB=${POSTGRES_DB:-postgres} volumes: - erp_pgdata:/var/lib/postgresql/data + ports: + - "5432:5432" healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-odoo} -d ${POSTGRES_DB:-postgres}"] interval: 10s @@ -19,7 +19,7 @@ services: retries: 10 odoo: - image: odoo:19.0 + build: . container_name: odoo-erp restart: unless-stopped env_file: .env @@ -35,8 +35,10 @@ services: - "18070:8069" volumes: - erp_webdata:/var/lib/odoo - - ./config:/etc/odoo - - ./addons:/mnt/extra-addons + - ./config/odoo18.conf:/etc/odoo/odoo.conf + - ./odoo18:/opt/odoo + - ./custom_addons:/mnt/extra-addons + - ./enterprise:/mnt/enterprise command: ["odoo", "-c", "/etc/odoo/odoo.conf"] volumes: