diff --git a/.gitmodules b/.gitmodules index a0e200a7..c815735c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -209,3 +209,7 @@ path = addons/swiss_payroll url = https://gitlab.giordano.ch/odoo/giordano-addons/swiss-payroll.git branch = 14.0 +[submodule "oca/contract"] + path = oca/contract + url = git@github.com:OCA/contract.git + branch = 14.0 diff --git a/addons/product_attribute b/addons/product_attribute index 46e6b4ae..dc1816d5 160000 --- a/addons/product_attribute +++ b/addons/product_attribute @@ -1 +1 @@ -Subproject commit 46e6b4ae43ccfb7e1d39116b953cecd3aa35dc4c +Subproject commit dc1816d5278d69e9b1f9c5535ecad33b950e24e9 diff --git a/config/addons_path b/config/addons_path index 8db97a5d..7182d73e 100644 --- a/config/addons_path +++ b/config/addons_path @@ -33,4 +33,5 @@ addons/sale_workflow oca/rest-framework addons/demodata addons/partner_contact -addons/swiss_payroll \ No newline at end of file +addons/swiss_payroll +oca/contract diff --git a/config/odoo-native.conf b/config/odoo-native.conf index 55cf0cd7..28122f95 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,5 +1,5 @@ [options] -addons_path = odoo/addons,addons,enterprise,oca/project,oca/hr-attendance,oca/hr-holidays,oca/web,oca/server-auth,oca/l10n-switzerland,oca/server-backend,addons/demand_planner,oca/server-ux,oca/knowledge,oca/stock-logistics-workflow,oca/partner-contact,addons/company,addons/product_attribute,oca/website,themes,addons/hr,addons/delegations,oca/reporting-engine,oca/server-tools,addons/impersonate,oca/product-attribute,oca/sale-workflow,addons/purchase_workflow,oca/dms,oca/social,oca/bank-statement-import,addons/website,addons/account_invoicing,addons/sale_workflow,oca/rest-framework,addons/demodata,addons/partner_contact,addons/swiss_payroll +addons_path = odoo/addons,addons,enterprise,oca/project,oca/hr-attendance,oca/hr-holidays,oca/web,oca/server-auth,oca/l10n-switzerland,oca/server-backend,addons/demand_planner,oca/server-ux,oca/knowledge,oca/stock-logistics-workflow,oca/partner-contact,addons/company,addons/product_attribute,oca/website,themes,addons/hr,addons/delegations,oca/reporting-engine,oca/server-tools,addons/impersonate,oca/product-attribute,oca/sale-workflow,addons/purchase_workflow,oca/dms,oca/social,oca/bank-statement-import,addons/website,addons/account_invoicing,addons/sale_workflow,oca/rest-framework,addons/demodata,addons/partner_contact,addons/swiss_payroll,oca/contract, ; 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 1bdc8eff..348a3e76 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,5 +1,5 @@ [options] -addons_path = /mnt/addons,/mnt/enterprise,/mnt/oca/project,/mnt/oca/hr-attendance,/mnt/oca/hr-holidays,/mnt/oca/web,/mnt/oca/server-auth,/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/partner-contact,/mnt/addons/company,/mnt/addons/product_attribute,/mnt/oca/website,/mnt/themes,/mnt/addons/hr,/mnt/addons/delegations,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/addons/impersonate,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/addons/purchase_workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/addons/website,/mnt/addons/account_invoicing,/mnt/addons/sale_workflow,/mnt/oca/rest-framework,/mnt/addons/demodata,/mnt/addons/partner_contact,/mnt/addons/swiss_payroll +addons_path = /mnt/addons,/mnt/enterprise,/mnt/oca/project,/mnt/oca/hr-attendance,/mnt/oca/hr-holidays,/mnt/oca/web,/mnt/oca/server-auth,/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/partner-contact,/mnt/addons/company,/mnt/addons/product_attribute,/mnt/oca/website,/mnt/themes,/mnt/addons/hr,/mnt/addons/delegations,/mnt/oca/reporting-engine,/mnt/oca/server-tools,/mnt/addons/impersonate,/mnt/oca/product-attribute,/mnt/oca/sale-workflow,/mnt/addons/purchase_workflow,/mnt/oca/dms,/mnt/oca/social,/mnt/oca/bank-statement-import,/mnt/addons/website,/mnt/addons/account_invoicing,/mnt/addons/sale_workflow,/mnt/oca/rest-framework,/mnt/addons/demodata,/mnt/addons/partner_contact,/mnt/addons/swiss_payroll,/mnt/oca/contract,/mnt/ admin_passwd = admin data_dir = /var/lib/odoo limit_time_real = 240 diff --git a/oca/contract b/oca/contract new file mode 160000 index 00000000..92949517 --- /dev/null +++ b/oca/contract @@ -0,0 +1 @@ +Subproject commit 929495172cb144206ae12bdcdba9a5eba79ed8df diff --git a/oca/dms b/oca/dms index b906f3fe..e4a96302 160000 --- a/oca/dms +++ b/oca/dms @@ -1 +1 @@ -Subproject commit b906f3fec881610f21c1f20aee057580575999d9 +Subproject commit e4a96302006b3f1623e4476c8712606c2049a630