diff --git a/.gitmodules b/.gitmodules index 239c7b51..06874b9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -109,3 +109,6 @@ [submodule "oca/openupgrade"] path = oca/openupgrade url = https://github.com/OCA/openupgrade +[submodule "oca/partner-contact"] + path = oca/partner-contact + url = git@github.com:OCA/partner-contact.git diff --git a/config/odoo-src.conf b/config/odoo-src.conf index 7336edfd..8cb89071 100644 --- a/config/odoo-src.conf +++ b/config/odoo-src.conf @@ -1,6 +1,6 @@ [options] -addons_path = odoo/addons,addons,enterprise,oca/project,oca/hr-attendance,oca/hr-holidays,oca/web,theme,oca/server-auth,oca/l10n-switzerland,oca/server-backend,addons/demand_planner,oca/server-ux,oca/knowledge,oca/stock-logistics-workflow,oca/openupgrade +addons_path = odoo/addons,addons,enterprise,oca/project,oca/hr-attendance,oca/hr-holidays,oca/web,theme,oca/server-auth,oca/l10n-switzerland,oca/server-backend,addons/demand_planner,oca/server-ux,oca/knowledge,oca/stock-logistics-workflow,oca/openupgrade,oca/partner-contact ; admin_passwd = admin admin_passwd = $pbkdf2-sha512$25000$rlUqpfTe2ztn7P2fcw7BOA$J9DDQN5WeT/.hyYeLNtJTOS6PhOsEbCeIN4iFaynjEY1PjW5zZwYVdR19qOEFVPOkR4HuHLi1EsV.juSjEc90w limit_time_real = 240 diff --git a/config/odoo.conf b/config/odoo.conf index 2ba75baf..fc33a12b 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,4 +1,4 @@ [options] -addons_path = /mnt/addons,/mnt/enterprise,/mnt/oca/project,/mnt/oca/hr-attendance,/mnt/oca/hr-holidays,/mnt/oca/web,/mnt/theme,/mnt/oca/server-auth,/mnt/oca/timesheet,/mnt/oca/l10n-switzerland,/mnt/oca/server-backend,/mnt/addons/demand_planner,/mnt/oca/server-ux,/mnt/oca/knowledge,/mnt/oca/stock-logistics-workflow +addons_path = /mnt/addons,/mnt/enterprise,/mnt/oca/project,/mnt/oca/hr-attendance,/mnt/oca/hr-holidays,/mnt/oca/web,/mnt/theme,/mnt/oca/server-auth,/mnt/oca/timesheet,/mnt/oca/l10n-switzerland,/mnt/oca/server-backend,/mnt/addons/demand_planner,/mnt/oca/server-ux,/mnt/oca/knowledge,/mnt/oca/stock-logistics-workflow,/mnt/oca/oca/partner-contact admin_passwd = admin data_dir = /var/lib/odoo \ No newline at end of file diff --git a/scripts/lib b/scripts/lib index 02efc43b..0412f48f 100755 --- a/scripts/lib +++ b/scripts/lib @@ -35,6 +35,6 @@ function locale() { export LANG=en_US.UTF-8 } -function load-odoo-env() { +function load-env() { export $(cat .env.$1 | sed 's/#.*//g' | xargs) } diff --git a/snippets/project.view_task_form2.parent_domain.xml b/snippets/project.view_task_form2.parent_domain.xml new file mode 100644 index 00000000..8237550a --- /dev/null +++ b/snippets/project.view_task_form2.parent_domain.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/snippets/sale.sale_order_portal_content.description.xml b/snippets/sale.sale_order_portal_content.description.xml new file mode 100644 index 00000000..a2549af3 --- /dev/null +++ b/snippets/sale.sale_order_portal_content.description.xml @@ -0,0 +1,6 @@ + + + +

+ + \ No newline at end of file diff --git a/task b/task index 3b4b14cf..69da5f31 100755 --- a/task +++ b/task @@ -1,4 +1,5 @@ #!/bin/bash +set -e function help() { echo @@ -194,14 +195,16 @@ function zip-module() { echo "Copy module $MODULE version $VERSION to tmp folder" MODULE_NAME="$MODULE-$VERSION" MODULE_PATH="tmp/$MODULE_NAME" - cp -r "$1" "$MODULE_PATH" + mkdir -p "$MODULE_PATH" + cp -r "$1/." "$MODULE_PATH" # configure and zip module echo "Remove auto install option" - sed -i'' -e "s/'auto_install': True,/'auto_install': False,/" $MODULE_PATH/__manifest__.py + sed -i'' -e "s/'auto_install': True,/'auto_install': False,/" "$MODULE_PATH/__manifest__.py" echo "Zip module $MODULE" cd tmp zip -q -r $MODULE_NAME.zip $MODULE_NAME + cd .. } function clear-filestore() { @@ -224,7 +227,7 @@ function disable-mailserver() { if test -z "$1"; then echo "\$1 is empty"; exit; fi activate-venv - load-odoo-env $1 + load-env $1 scripts/odooctl --model 'ir.mail_server' --field 'active' --value False scripts/odooctl --model 'fetchmail.server' --field 'active' --value False } @@ -238,7 +241,7 @@ function update-odoo-view() { NAME="mint_system.$FILE" activate-venv - load-odoo-env $1 + load-env $1 scripts/odooctl --model 'ir.ui.view' --domain "['name', '=', '$NAME']" --field 'arch_base' --value "'''$(cat $2)'''" } @@ -250,6 +253,32 @@ function update-app-list() { echo "env['ir.module.module'].update_list()" | odoo-bin shell -d $1 --config 'config/odoo-src.conf' --no-http } +function init-next-env() { + if test -z "$1"; then echo "\$1 is empty"; exit; fi + + echo "Init env file: .env.$1" + echo "NEXTCLOUD_URL=" > .env.$1 + echo "NEXTCLOUD_USERNAME=" >> .env.$1 + echo "NEXTCLOUD_PASSWORD=" >> .env.$1 + cat .env.$1 +} + +function upload-module() { + if test -z "$1"; then echo "\$1 is empty"; exit; fi + if test -z "$2"; then echo "\$1 is empty"; exit; fi + + zip-module $2 + + # Get path to zip file and upload url + FILE_PATH="tmp/$MODULE_NAME.zip" + pwd + load-env $1 + NEXTCLOUD_UPLOAD_URL="$NEXTCLOUD_URL/remote.php/dav/files/$NEXTCLOUD_USERNAME/Odoo-Apps/" + + # Upload zip file + curl -u "$NEXTCLOUD_USERNAME:$NEXTCLOUD_PASSWORD" -T "$FILE_PATH" "$NEXTCLOUD_UPLOAD_URL" + echo "File $FILE_PATH uploaded to $NEXTCLOUD_UPLOAD_URL." +} case "$1" in disable-auto-install) @@ -336,6 +365,12 @@ case "$1" in update-app-list) update-app-list $2 ;; + init-next-env) + init-next-env $2 + ;; + upload-module) + upload-module $2 $3 + ;; *) help task exit 1 diff --git a/task.md b/task.md index 69f3ec3b..cb7f93f3 100644 --- a/task.md +++ b/task.md @@ -9,7 +9,8 @@ | disable-mailserver | [env] | Disable mail server settings via xmlrpc. | | drop-db | [db] | Drop target Odoo database. | | init-db | [db] | Initialize the Odoo database. Optionally pass db name. | -| init-odoo-env | [env] | Create env file for environement. | +| init-next-env | [env] | Create env file for Nextcloud instance. | +| init-odoo-env | [env] | Create env file for Odoo Instance. | | init-venv | | Initialize python virtual env. | | install-module | [db] [name] | Install target Odoo module. | | install-odoo-scripts | | Install Odoo scripts. | @@ -26,5 +27,5 @@ | update-module | [db] [name] | Update target Odoo module. | | update-odoo-view | [env] [path] | Update view xml definition. | | | | `task update-odoo-view myenv snippets/mrp.report_mrporder.show_stock.xml` | -| zip-module | [path] | Create zip file for module. | -| | | | +| upload-module | [env] [path] | Zip and upload Odoo module. | +| zip-module | [path] | Create zip file for module. | \ No newline at end of file diff --git a/template/ms_custom_module/__manifest__.py b/template/ms_custom_module/__manifest__.py index 180cf4f5..6a7a28db 100644 --- a/template/ms_custom_module/__manifest__.py +++ b/template/ms_custom_module/__manifest__.py @@ -25,6 +25,8 @@ 'views/views.xml', ], + 'qweb': ['static/src/xml/board.xml'], + 'demo': [ 'demo/demo.xml', ],