Merge branch 'new/14.0/more_oca' into '14.0'

new/14.0/more_oca into 14.0

See merge request hibou-io/hibou-odoo/suite!934
This commit is contained in:
Jared Kipe
2021-06-20 18:46:57 +00:00
6 changed files with 14 additions and 0 deletions

8
.gitmodules vendored
View File

@@ -8,3 +8,11 @@
[submodule "external/camptocamp-cloud-platform"]
path = external/camptocamp-cloud-platform
url = https://github.com/hibou-io/camptocamp-cloud-platform.git
[submodule "external/hibou-oca/server-brand"]
path = external/hibou-oca/server-brand
url = https://github.com/hibou-io/oca-server-brand.git
branch = 14.0
[submodule "external/hibou-oca/social"]
path = external/hibou-oca/social
url = https://github.com/hibou-io/oca-social.git
branch = 14.0

2
debian/odoo.conf vendored
View File

@@ -1,5 +1,7 @@
[options]
addons_path = /opt/odoo/hibou-suite,/opt/odoo/odoo/addons
; You can include more external modules by including them in the path, e.g.
; addons_path = /opt/odoo/hibou-suite,/opt/odoo/hibou-suite/external/hibou-oca/server-brand,/opt/odoo/odoo/addons
data_dir = /var/lib/odoo
; admin_passwd = admin
; csv_internal_sep = ,

1
external/hibou-oca/social vendored Submodule

1
mail_debrand Symbolic link
View File

@@ -0,0 +1 @@
./external/hibou-oca/social/mail_debrand

1
mass_mailing_partner Symbolic link
View File

@@ -0,0 +1 @@
./external/hibou-oca/social/mass_mailing_partner