Merge branch 'feature/approval' into dev

.gitignore

@@ -2,6 +2,7 @@
 _build/
 
 # dotfiles
+
 .*
 !.gitignore
 !.github
@@ -39,7 +40,6 @@ tsconfig.json
 package-lock.json
 package.json
 .husky
-
 # various virtualenv
 /bin/
 /build/

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "Odoo18-Enterprise"]
+[submodule "Odoo18-Extra-Addons"]
 	path = extra-addons
-	url = https://git.nextzenos.com/NextERP/Odoo18-Enterprise.git
+	url = https://git.nextzenos.com/NextERP/Odoo18-Extra-Addons.git

Makefile

@@ -1,3 +1,6 @@
+ifneq ("$(wildcard .env)", "")
+	include .env
+endif
 .SHELLFLAGS += ${SHELLFLAGS} -e
 PWD = $(shell pwd)
 UID = $(shell id -u)
@@ -23,6 +26,7 @@ CONTAINER_ID=${PROJECT}-${TAG}
 VERSION := community
 ADDONS=${PWD}/addons,${PWD}/odoo/addons,${PWD}/extra-addons
 BACKUP=${CDN}/raw/branch/main/backup/${VERSION}/odoo18-main_2025-01-15_08-05-47.zip
+
 ##### Native  Deployment#########
 install:
 	sudo apt update -y && \
@@ -41,7 +45,7 @@ download_backup:
 	${PWD}/setup/download_backup.sh $$LinkDB backup.zip
 gen_config:
 	$(MAKE) download_backup LINKDB=${BACKUP}
-	${PWD}/setup/init_config.sh --native ${ADDONS}
+	${PWD}/setup/init_config.sh --native ${ADDONS} ${DB_USER} ${DB_PASSWORD} ${DB_SERVER} ${DB_PORT}
 run_server:
 	${PYTHON} odoo-bin --config=${CONFIG} 
 run_test: 

env.template

@@ -0,0 +1,4 @@
+DB_USER=
+DB_PASSWORD= 
+DB_SERVER=
+DB_PORT=5432

setup/init_config.sh

@@ -5,7 +5,6 @@ export DEBIAN_FRONTEND=noninteractive
 set -euo pipefail
 DEPLOY_PATH=$(pwd)/deployment
 SETUP_PATH=$(pwd)/setup
-
 PIP=$(pwd)/venv/bin/pip
 PYTHON=$(pwd)/venv/bin/python
 ODOO_ADDONS=${DEPLOY_PATH}/addons
@@ -194,9 +193,10 @@ Generate_Config_Docker(){
     Show 0 " Generate Config Complete"
 }
 Generate_Config_Native(){
-    # Load environment variables from .env file
-    Show 2 "Environment variables loaded:"
-    printenv | sort
+    DB_USER=${2:-}
+    DB_PASSWORD=${3:-}
+    DB_SERVER=${4:-}
+    DB_PORT=${5:-}
     ADDONS=${1:-}
     REPO_NAME=$(basename "$(git rev-parse --show-toplevel)" | sed -E 's/[.-]/_/g')
     USER="${REPO_NAME:-"default_repo"}" 
@@ -230,7 +230,7 @@ main(){
     # Check_Docker_Install
     case "$TYPE" in
     --native)
-    Generate_Config_Native $2
+    Generate_Config_Native $2 $3 $4 $5 $6
     ;;
     --docker)
     Generate_Config_Docker $2 $3 $4
@@ -242,4 +242,4 @@ main(){
     esac
 }
 
-main ${1:-} ${2:-} ${3:-} ${4:-}
+main "$@"