diff --git a/odoo/external-src/account-fiscal-rule b/odoo/external-src/account-fiscal-rule index fbd17a2f23f..6e3dec56eeb 160000 --- a/odoo/external-src/account-fiscal-rule +++ b/odoo/external-src/account-fiscal-rule @@ -1 +1 @@ -Subproject commit fbd17a2f23fe336dbd665573fb41649067be2935 +Subproject commit 6e3dec56eeb61b3e83f0103724a82938b30e6d67 diff --git a/odoo/external-src/bank-payment b/odoo/external-src/bank-payment index c5d0eb45066..42fda519dd4 160000 --- a/odoo/external-src/bank-payment +++ b/odoo/external-src/bank-payment @@ -1 +1 @@ -Subproject commit c5d0eb4506693661d18fb794ce12de542e7b0135 +Subproject commit 42fda519dd4dd4741c790112482afaaf409b2535 diff --git a/odoo/external-src/crm b/odoo/external-src/crm index a0a98a385cd..706699ef99e 160000 --- a/odoo/external-src/crm +++ b/odoo/external-src/crm @@ -1 +1 @@ -Subproject commit a0a98a385cd300775cfa35232119bf44dda6e224 +Subproject commit 706699ef99e1a4492584a520514759e67b1d5862 diff --git a/odoo/external-src/kencove-sodexis b/odoo/external-src/kencove-sodexis index a857005989f..612cd53df5b 160000 --- a/odoo/external-src/kencove-sodexis +++ b/odoo/external-src/kencove-sodexis @@ -1 +1 @@ -Subproject commit a857005989f4ee7fde4585fb0871349f7f50fb52 +Subproject commit 612cd53df5bed0303900aa404341c8302048a083 diff --git a/odoo/external-src/l10n-usa b/odoo/external-src/l10n-usa index 3a3cab07f11..ab6ade3be48 160000 --- a/odoo/external-src/l10n-usa +++ b/odoo/external-src/l10n-usa @@ -1 +1 @@ -Subproject commit 3a3cab07f11dc1234b1f009d27ba2694b58b6dad +Subproject commit ab6ade3be48bc608df34239460b60fca580304d4 diff --git a/odoo/external-src/sale-workflow b/odoo/external-src/sale-workflow index b47cc24000e..ed1e2cb9825 160000 --- a/odoo/external-src/sale-workflow +++ b/odoo/external-src/sale-workflow @@ -1 +1 @@ -Subproject commit b47cc24000e7415b7f7b34479dc16cb6672d7102 +Subproject commit ed1e2cb9825791f91154dcc1976c95fda1990ec4 diff --git a/odoo/external-src/server-tools b/odoo/external-src/server-tools index fe49e11a36d..08e5f1f38ff 160000 --- a/odoo/external-src/server-tools +++ b/odoo/external-src/server-tools @@ -1 +1 @@ -Subproject commit fe49e11a36de03585e6b4b4d80fbf1a55b2089b4 +Subproject commit 08e5f1f38ff1d19142c2ed10ac56bafe46531a4c diff --git a/odoo/external-src/social b/odoo/external-src/social index a8f82639c6a..70e5c66350b 160000 --- a/odoo/external-src/social +++ b/odoo/external-src/social @@ -1 +1 @@ -Subproject commit a8f82639c6a3085e3e62dea197bdf61f36d61942 +Subproject commit 70e5c66350b5339bb6f80e1627bdd853a9bd263c diff --git a/odoo/external-src/stock-rma b/odoo/external-src/stock-rma index f7fbaffeb2e..47458c13925 160000 --- a/odoo/external-src/stock-rma +++ b/odoo/external-src/stock-rma @@ -1 +1 @@ -Subproject commit f7fbaffeb2e3187efb1950f03131a1f99d1788d7 +Subproject commit 47458c139254dcc4eb9903441e5b1be7eb5b2bce diff --git a/odoo/migration.yml b/odoo/migration.yml index 18648d63ed9..1f1689e9e56 100644 --- a/odoo/migration.yml +++ b/odoo/migration.yml @@ -436,10 +436,16 @@ migration: - 'sh -c ''psql -c "UPDATE project_project SET bill_type = ''customer_task'' WHERE bill_type = ''no'';"''' post: - anthem songs.0-1-10.general::main + - anthem songs.0-1-10.stock::main addons: upgrade: + - account_avatax + - kencove - kencove_purchase - kencove_sale + - mail_activity_board + - mail_activity_team + - mail_debrand - muk_rest - printnode_base - s2u_oauth2 diff --git a/odoo/songs/0-1-10/data/delivery.carrier.csv b/odoo/songs/0-1-10/data/delivery.carrier.csv new file mode 100644 index 00000000000..53c2302e256 --- /dev/null +++ b/odoo/songs/0-1-10/data/delivery.carrier.csv @@ -0,0 +1,4 @@ +"id","name","delivery_type","carrier_type","customer_pickup","product_id/id" +"__setup__.delivery_carrier_1","Customer Pickup Office","Fixed Price","Parcel","True","delivery.product_product_delivery" +"__setup__.delivery_carrier_2","Customer Pickup Dock","Fixed Price","Parcel","True","delivery.product_product_delivery" +"__setup__.delivery_carrier_3","Customer Arranged Truck","Fixed Price","Truck","True","delivery.product_product_delivery" diff --git a/odoo/songs/0-1-10/stock.py b/odoo/songs/0-1-10/stock.py new file mode 100644 index 00000000000..cb7aa40de74 --- /dev/null +++ b/odoo/songs/0-1-10/stock.py @@ -0,0 +1,18 @@ +# Copyright (c) 2021 Sodexis +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) + +import anthem + +from ..common import load_csv + + +@anthem.log +def set_delivery_carrier(ctx): + """ Set Delivery Carriers """ + load_csv(ctx, "songs/0-1-10/data/delivery.carrier.csv") + + +@anthem.log +def main(ctx): + """ Set stock """ + set_delivery_carrier(ctx) diff --git a/repos.yml b/repos.yml index 81fad0ab9ab..c39dc42428f 100644 --- a/repos.yml +++ b/repos.yml @@ -6,7 +6,7 @@ - oca 14.0 - oca refs/pull/150/head - oca refs/pull/162/head - target: &default_target kencove kcv/14.0.0.1.10 + target: &default_target kencove kcv/14.0.0.1.10-sod ./odoo/external-src/account-payment: remotes: @@ -92,7 +92,7 @@ kencove: git+ssh://git@github.com/kencove/server-tools.git merges: - oca 14.0 - - oca refs/pull/1942/head + - oca refs/pull/1976/head target: *default_target ./odoo/external-src/social: