From 61dc91292894322eef594be21def9aa3fde3734a Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Mon, 30 Nov 2020 15:51:50 +0100 Subject: [PATCH] patch files --- config/odoo-src.conf | 7 +++++-- config/odoo.conf | 4 ++-- task | 35 +++++++++++++++++++++++++++-------- task.md | 7 ++++--- 4 files changed, 38 insertions(+), 15 deletions(-) diff --git a/config/odoo-src.conf b/config/odoo-src.conf index 13681107..4608c28c 100644 --- a/config/odoo-src.conf +++ b/config/odoo-src.conf @@ -1,3 +1,6 @@ [options] -addons_path = addons,../addons,../enterprise,../oca/project -;addons_path = addons,../addons,../oca/management-system,../oca/knowledge,../oca/crm,../oca/project,../oca/reporting-engine \ No newline at end of file +addons_path = addons,../addons,../enterprise,../oca/project,../oca/web +;addons_path = addons,../addons,../oca/management-system,../oca/knowledge,../oca/crm,../oca/project,../oca/reporting-engine +; Data import take more time-1430259113 +limit_time_real = 240 +log_level = debug \ No newline at end of file diff --git a/config/odoo.conf b/config/odoo.conf index d3505c98..56195f14 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,6 +1,6 @@ [options] -addons_path = /mnt/addons,/mnt/enterprise,/mnt/oca/project -admin_passwd = $pbkdf2-sha512$25000$mvO.VwrBeC.F0Nr7n3Nu7Q$q0TVU01NjKZcoE8/1a5urEmpLbX2qQn/8RVKqZUh6uaqJgtobBm10MAw0KnL8i2enNkh7PkEzNiB3jGSVA2AXQ +addons_path = /mnt/addons,/mnt/enterprise,/mnt/oca/project,/mnt/oca/hr-attendance,/mnt/oca/hr-holidays,/mnt/oca/timesheet,/mnt/oca/web,/mnt/oca/server-auth,/mnt/oca/web +admin_passwd = $pbkdf2-sha512$25000$8D5nbM15by1FSEnJudea0w$uURUjIJbs4oC6/ympdUrSKfvr9TizRn0/e6gO94oKnszBr0f8MzZ/dp6aicPTxL3OGIzgO/XMCMI.jD9dl.m7w csv_internal_sep = , data_dir = /var/lib/odoo db_host = db diff --git a/task b/task index 416ae07d..7672788a 100755 --- a/task +++ b/task @@ -34,28 +34,35 @@ function install-src() { activate-venv pip install setuptools psycopg2-binary watchdog phonenumbers pip install -r requirements.txt - cd .. +} + +function start-shell() { + if test -z "$1" + then + echo "\$1 is empty" + else + cd odoo + locale + ./odoo-bin shell -d $1 --db_host=localhost -r odoo -w odoo --addons-path='../addons' --no-http + fi } function init-db() { cd odoo locale activate-venv && ./odoo-bin --init base -d odoo --db_host=localhost -r odoo -w odoo --stop-after-init - cd .. } function start-src() { cd odoo locale activate-venv && ./odoo-bin --config=../config/odoo-src.conf --db_host=localhost -r odoo -w odoo --dev=all - cd .. } function update-module() { cd odoo locale - activate-venv && ./odoo-bin -u $1 -d odoo --db_host=localhost -r odoo -w odoo --stop-after-init - cd .. + activate-venv && ./odoo-bin -d $1 -u $2 --db_host=localhost -r odoo -w odoo --stop-after-init --no-http } function scaffold-src() { @@ -65,7 +72,6 @@ function scaffold-src() { else cd odoo python3 odoo-bin scaffold $1 ../addons - cd .. fi } @@ -94,6 +100,13 @@ function clear-assets() { fi } +function upload-module() { + + if [ "$1" = "certificate_planer" ]; then + rsync -av -e ssh --exclude='.git' addons/certificate_planer hermes.mint-system.com:/usr/share/odoo05/addons/ + fi +} + case "$1" in disable-auto-install) disable-auto-install @@ -128,8 +141,14 @@ case "$1" in start-src) start-src ;; + start-shell) + start-shell $2 + ;; update-module) - update-module $2 + update-module $2 $3 + ;; + upload-module) + upload-module $2 ;; scaffold-src) scaffold-src $2 @@ -155,4 +174,4 @@ case "$1" in *) help task exit 1 -esac +esac \ No newline at end of file diff --git a/task.md b/task.md index 3bc10b4d..3ddd9a8d 100644 --- a/task.md +++ b/task.md @@ -9,10 +9,11 @@ start-db| |Start database container only. install-src| |Install Odoo requirements in source folder. init-db| |Initialize the Odoo database. start-src| |Start Odoo from source folder. -update-module|[name]|Update target Odoo module. +start-shell|[db]|Start Odoo shell from source folder. +update-module|[db] [name]|Update target Odoo module. scaffold-src|[name]|Scaffold new Odoo module from source. -drop-db|[name]|Drop target Odoo database. +drop-db|[db]|Drop target Odoo database. compile-managed-modules| |Package managed Odoo modules. copy-managed-modules| |Copy managed Odoo modules to addon folder. remove-managed-modules| |Remove managed Odoo modules from add folder -clear-assets|[name]|Clear Odoo assets. \ No newline at end of file +clear-assets|[db]|Clear Odoo assets.