diff --git a/HISTORY.rst b/HISTORY.rst index f1f90faf1fb..75ca605a6aa 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -24,6 +24,8 @@ Latest (Unreleased) adjusted in the cron parameters) * BSIBSO-1107: Change the delivery date of a picking +* BSIBSO-1103 Connector-exchange: add flag on res.users to filter for Odoo events +* BSIBSO-1103 Connector-exchange: add parameter to search with a max horizon **Bugfixes** * BSIBSO-1092: fix invoicing of sales with MRC @@ -41,6 +43,7 @@ Latest (Unreleased) - analytic_tag_dimension_purchase_warning - analytic_tag_dimension_sale_warning +* BSIBSO-1103 Update OCA/connector repository **Documentation** diff --git a/odoo/external-src/connector b/odoo/external-src/connector index af0639d75a9..fce733174d8 160000 --- a/odoo/external-src/connector +++ b/odoo/external-src/connector @@ -1 +1 @@ -Subproject commit af0639d75a9bdef802a9c8a93fd7de2bb8851fec +Subproject commit fce733174d8b112c7d6eba1ca57fec055f8a4b27 diff --git a/odoo/external-src/connector-exchange b/odoo/external-src/connector-exchange index 04ee7e3ea45..d747f9f2f65 160000 --- a/odoo/external-src/connector-exchange +++ b/odoo/external-src/connector-exchange @@ -1 +1 @@ -Subproject commit 04ee7e3ea450b2fdabaf978ff08354b80ab0e763 +Subproject commit d747f9f2f6593b14cd1077428203d8b4d12231a1 diff --git a/odoo/migration.yml b/odoo/migration.yml index 33ce4c814d5..8fcae124f86 100644 --- a/odoo/migration.yml +++ b/odoo/migration.yml @@ -432,3 +432,8 @@ migration: #### local-src - specific_security - specific_sale + # OCA/connector + - component + - component_event + # camptocamp/connector-exchange + - connector_exchange diff --git a/odoo/pending-merges.yaml b/odoo/pending-merges.yaml index 7ad08aa93e4..b9044bb28ca 100644 --- a/odoo/pending-merges.yaml +++ b/odoo/pending-merges.yaml @@ -47,6 +47,15 @@ # account_invoice_merge module refactor - oca refs/pull/386/head target: *default_target +./external-src/connector-exchange: + remotes: + camptocamp: git@github.com:camptocamp/connector-exchange.git + merges: + - camptocamp 10.0 + # [10.0][ADD] Find Events : odoo category filtering + max horizon + - camptocamp refs/pull/14/head + - camptocamp refs/pull/15/head + target: *default_target ./src: remotes: oca: git@github.com:OCA/OCB.git diff --git a/odoo/requirements.txt b/odoo/requirements.txt index 244ab8c8370..40d10b7dcf5 100644 --- a/odoo/requirements.txt +++ b/odoo/requirements.txt @@ -26,10 +26,14 @@ responses mailchimp3==3.0.4 # connector_exchange -git+https://github.com/yvaucher/pyews@PyEWS_Events_Management#egg=pyews +git+https://github.com/camptocamp/pyews@PyEWS_Events_Management#egg=pyews contextlib2==0.5.4 vcrpy==1.10.5 #connector telephony phonenumbers==8.9.10 py-Asterisk==0.5.17 + +# OCA base connector +cachetools>=2.0.1,<3.0.0 +unittest2