Merge pull request OCA#263 from camptocamp/BSIBSO-1103

BSIBSO-1103 exchange connector improvements
camptocamp · Nov 28, 2018 · 713eaea · 713eaea
2 parents 606d73a + b79b1cc
commit 713eaea
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git 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
diff --git a/odoo/external-src/connector-exchange b/odoo/external-src/connector-exchange
diff --git 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
@@ -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
@@ -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