diff --git a/.gitmodules b/.gitmodules index 745d92fe..217ee0c5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -54,3 +54,7 @@ path = oca/server-ux url = git@github.com:OCA/server-ux.git branch = 16.0 +[submodule "oca/brand"] + path = oca/brand + url = git@github.com:OCA/brand.git + branch = 16.0 diff --git a/config/odoo-native.conf b/config/odoo-native.conf index 0b84566f..c24f7d24 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,5 +1,5 @@ [options] -addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux +addons_path = odoo/addons,enterprise,themes,odoo,oca/partner-contact,addons/server_tools,addons/project,oca/project,oca/web,oca/timesheet,oca/crm,oca/knowledge,oca/server-auth,oca/server-backend,oca/server-ux,oca/brand ; 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 db2344e4..31c59c8a 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,5 +1,5 @@ [options] -addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux +addons_path = /mnt/enterprise,/mnt/themes,/mnt/oca/partner-contact,/mnt/addons/server_tools,/mnt/addons/project,/mnt/oca/project,/mnt/oca/web,/mnt/oca/timesheet,/mnt/oca/crm,/mnt/oca/knowledge,/mnt/oca/server-auth,/mnt/oca/server-backend,/mnt/oca/server-ux,/mnt/oca/brand admin_passwd = admin data_dir = /var/lib/odoo limit_time_real = 240 diff --git a/oca/brand b/oca/brand new file mode 160000 index 00000000..5de528cb --- /dev/null +++ b/oca/brand @@ -0,0 +1 @@ +Subproject commit 5de528cb7e1d85238e82b96cbcf56a9216ef856e diff --git a/snippets/base.view_company_form.show_analytic_plan_id.xml b/snippets/base.view_company_form.show_analytic_plan_id.xml new file mode 100644 index 00000000..ef2198c6 --- /dev/null +++ b/snippets/base.view_company_form.show_analytic_plan_id.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/snippets/project.view_task_form2.domain_gantt_dates.xml b/snippets/project.view_task_form2.domain_gantt_dates.xml new file mode 100644 index 00000000..b77a66ed --- /dev/null +++ b/snippets/project.view_task_form2.domain_gantt_dates.xml @@ -0,0 +1,12 @@ + + + + + + + + + +