diff --git a/.gitmodules b/.gitmodules index 47033cda..57449011 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,11 +10,6 @@ path = themes url = git@github.com:odoo/design-themes.git branch = 15.0 -[submodule "addons/swiss_payroll"] - path = addons/swiss_payroll - url = https://gitlab.giordano.ch/odoo/giordano-addons/swiss-payroll.git - branch = 15.0 - update = none [submodule "addons/manufacture"] path = addons/manufacture url = git@github.com:Mint-System/Odoo-Apps-Manufacture.git diff --git a/addons/swiss_payroll b/addons/swiss_payroll deleted file mode 160000 index d906b3f0..00000000 --- a/addons/swiss_payroll +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d906b3f02cd292c86615f0eb522838da02e342d0 diff --git a/config/addons_path b/config/addons_path index ed49bf7f..f08c289d 100644 --- a/config/addons_path +++ b/config/addons_path @@ -2,7 +2,7 @@ addons addons/hr addons/manufacture addons/purchase_workflow -addons/swiss_payroll +addons/odoo_apps_partner addons/stock_logistics_workflow enterprise oca/connector diff --git a/config/odoo-native.conf b/config/odoo-native.conf index c1f3dfcd..acbd1be8 100644 --- a/config/odoo-native.conf +++ b/config/odoo-native.conf @@ -1,5 +1,5 @@ [options] -addons_path = odoo/addons,addons,addons/hr,addons/manufacture,addons/purchase_workflow,addons/swiss_payroll,addons/stock_logistics_workflow,enterprise,oca/connector,oca/partner-contact,oca/stock-logistics-workflow,oca/hr-holidays,oca/product-attribute,oca/project,oca/rest-framework,oca/web,themes +addons_path = odoo/addons,addons,addons/hr,addons/manufacture,addons/purchase_workflow,addons/odoo_apps_partner,addons/stock_logistics_workflow,enterprise,oca/connector,oca/partner-contact,oca/stock-logistics-workflow,oca/hr-holidays,oca/product-attribute,oca/project,oca/rest-framework,oca/web,themes ; 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 087e95f2..d8841413 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,5 +1,5 @@ [options] -addons_path = /mnt/addons,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/purchase_workflow,/mnt/addons/swiss_payroll,/mnt/addons/stock_logistics_workflow,/mnt/enterprise,/mnt/oca/connector,/mnt/oca/partner-contact,/mnt/oca/stock-logistics-workflow,/mnt/oca/hr-holidays,/mnt/oca/product-attribute,/mnt/oca/project,/mnt/oca/rest-framework,/mnt/oca/web,/mnt/themes +addons_path = /mnt/addons,/mnt/addons/hr,/mnt/addons/manufacture,/mnt/addons/purchase_workflow,/mnt/addons/odoo_apps_partner,/mnt/addons/stock_logistics_workflow,/mnt/enterprise,/mnt/oca/connector,/mnt/oca/partner-contact,/mnt/oca/stock-logistics-workflow,/mnt/oca/hr-holidays,/mnt/oca/product-attribute,/mnt/oca/project,/mnt/oca/rest-framework,/mnt/oca/web,/mnt/themes admin_passwd = admin data_dir = /var/lib/odoo limit_time_real = 240 diff --git a/enterprise b/enterprise index 7dd7f20a..9274e025 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 7dd7f20ab6d14a99be7061dda1b76864cd230783 +Subproject commit 9274e025a1ad35f3b7422f580feff68b0579a2b6 diff --git a/oca/bank-statement-import b/oca/bank-statement-import index 01fd1534..aac055d2 160000 --- a/oca/bank-statement-import +++ b/oca/bank-statement-import @@ -1 +1 @@ -Subproject commit 01fd153409bba34ae00731290c1f3f53df59907b +Subproject commit aac055d2c4b83148e6f06c7e3ca138beba8c02a8 diff --git a/oca/contract b/oca/contract index 2be9ec4f..b5dc2af3 160000 --- a/oca/contract +++ b/oca/contract @@ -1 +1 @@ -Subproject commit 2be9ec4fd693c97d479da1ad4c8409449e7763c7 +Subproject commit b5dc2af3732f2798ca5e379c6238f3bd897239ac diff --git a/oca/edi b/oca/edi index 1ab752f0..963bade6 160000 --- a/oca/edi +++ b/oca/edi @@ -1 +1 @@ -Subproject commit 1ab752f058ccc5dc54393f054f45e51807609778 +Subproject commit 963bade61e1df80b10a46cb8f9c5cf4569488417 diff --git a/oca/knowledge b/oca/knowledge index 76f685a4..112a81ca 160000 --- a/oca/knowledge +++ b/oca/knowledge @@ -1 +1 @@ -Subproject commit 76f685a499fe9b0bea67aa8803b0991204ea2744 +Subproject commit 112a81cacc5ac1c543f36afa1b54184d89e9701d diff --git a/oca/partner-contact b/oca/partner-contact index fa669d0f..468346b7 160000 --- a/oca/partner-contact +++ b/oca/partner-contact @@ -1 +1 @@ -Subproject commit fa669d0f7c5ff557391ecdffbfce1b9a7d816821 +Subproject commit 468346b72dde683fdb4484c435976691be6e2e13 diff --git a/oca/product-attribute b/oca/product-attribute index 715ed44f..a4532a45 160000 --- a/oca/product-attribute +++ b/oca/product-attribute @@ -1 +1 @@ -Subproject commit 715ed44f23e2792263c2766c515f733ec5c60ebc +Subproject commit a4532a45d5af536a9c34b4e31e8391d036051d84 diff --git a/oca/purchase-workflow b/oca/purchase-workflow index 60e35f80..f3b0f4c8 160000 --- a/oca/purchase-workflow +++ b/oca/purchase-workflow @@ -1 +1 @@ -Subproject commit 60e35f804ca13f10a8b723d9a4cb838deba8cb01 +Subproject commit f3b0f4c8c54301e6c192a3e1dbbe0d46d364d87c diff --git a/oca/sale-workflow b/oca/sale-workflow index cd8edc16..c1cb147c 160000 --- a/oca/sale-workflow +++ b/oca/sale-workflow @@ -1 +1 @@ -Subproject commit cd8edc161973f0c441ea8638d22caf7e6d3cea94 +Subproject commit c1cb147cb65f0605a2c2912cff0e6335c43adc67 diff --git a/oca/server-tools b/oca/server-tools index 17300e25..8aa1bc46 160000 --- a/oca/server-tools +++ b/oca/server-tools @@ -1 +1 @@ -Subproject commit 17300e25d4acd08f0529586c55d85482811bacc5 +Subproject commit 8aa1bc4679799bfe6a5e808470974be851a6ec5f diff --git a/oca/stock-logistics-warehouse b/oca/stock-logistics-warehouse index 606e9085..f0467985 160000 --- a/oca/stock-logistics-warehouse +++ b/oca/stock-logistics-warehouse @@ -1 +1 @@ -Subproject commit 606e90850127b46219c0935f4e4ed57707f19d4e +Subproject commit f0467985a8db5341e18de7b75a1a0385082ad11e diff --git a/oca/stock-logistics-workflow b/oca/stock-logistics-workflow index b7299623..657a84f7 160000 --- a/oca/stock-logistics-workflow +++ b/oca/stock-logistics-workflow @@ -1 +1 @@ -Subproject commit b7299623890c9e379f2b3a1897d0841dce358d7e +Subproject commit 657a84f70a15bcc4b073e0761ca02e09b018ab99 diff --git a/odoo b/odoo index 354433e7..e35a4d87 160000 --- a/odoo +++ b/odoo @@ -1 +1 @@ -Subproject commit 354433e7ba5b5f81f83368e497a8bed5059c91d5 +Subproject commit e35a4d87578a588e33f604638289ca7e7ee02029