From b849416890f5eb3bb41cf9290917461ee651d8b5 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Sat, 13 Jul 2019 08:04:34 -0700
Subject: [PATCH 01/13] FIX `sale_planner` accidental recursion when creating a
 FakePartner from a dictionary withou 'date_localization'

---
 sale_planner/wizard/order_planner.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sale_planner/wizard/order_planner.py b/sale_planner/wizard/order_planner.py
index 75c81fca..54b654fa 100644
--- a/sale_planner/wizard/order_planner.py
+++ b/sale_planner/wizard/order_planner.py
@@ -50,13 +50,14 @@ class FakePartner():
         self.partner_latitude = 0.0
         self.partner_longitude = 0.0
         self.is_company = False
+        self._date_localization = kwargs.pop('date_localization', False)
         for attr, value in kwargs.items():
             setattr(self, attr, value)
 
     @property
     def date_localization(self):
-        if not hasattr(self, 'date_localization') and self.date_localization:
-            self.date_localization = 'TODAY!'
+        if not self._date_localization:
+            self._date_localization = 'TODAY!'
             # The fast way.
             if SearchEngine and self.zip:
                 with SearchEngine() as search:
@@ -64,7 +65,7 @@ class FakePartner():
                     if zipcode and zipcode.lat:
                         self.partner_latitude = zipcode.lat
                         self.partner_longitude = zipcode.lng
-                        return self.date_localization
+                        return self._date_localization
 
             # The slow way.
             result = geo_find(geo_query_address(
@@ -76,7 +77,7 @@ class FakePartner():
                 self.partner_latitude = result[0]
                 self.partner_longitude = result[1]
 
-        return self.date_localization
+        return self._date_localization
 
 
 class FakeOrderLine():

From c91c53d59ec0a9a4b0bb8db37156bd7214bbbc62 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Mon, 15 Jul 2019 08:17:42 -0700
Subject: [PATCH 02/13] FIX `sale_planner` FakeSaleOrder project_id =>
 analytic_accout_id

---
 sale_planner/wizard/order_planner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sale_planner/wizard/order_planner.py b/sale_planner/wizard/order_planner.py
index 54b654fa..0df5a236 100644
--- a/sale_planner/wizard/order_planner.py
+++ b/sale_planner/wizard/order_planner.py
@@ -133,7 +133,7 @@ class FakeSaleOrder():
         self.id = 0
         self.name = 'Quote'
         self.team_id = None
-        self.project_id = None
+        self.analytic_account_id = None
         self.amount_total = 0.0
         for attr, value in kwargs.items():
             setattr(self, attr, value)

From d60ab09e6e0f7fe3b88979c4c2a271acd5053cca Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Mon, 15 Jul 2019 09:47:51 -0700
Subject: [PATCH 03/13] IMP `sale_planner` Fake objects now return False for
 any attribute they don't implement.

---
 sale_planner/wizard/order_planner.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sale_planner/wizard/order_planner.py b/sale_planner/wizard/order_planner.py
index 0df5a236..50a2fca6 100644
--- a/sale_planner/wizard/order_planner.py
+++ b/sale_planner/wizard/order_planner.py
@@ -79,6 +79,9 @@ class FakePartner():
 
         return self._date_localization
 
+    def __getattr__(self, item):
+        return False
+
 
 class FakeOrderLine():
     def __init__(self, **kwargs):
@@ -109,6 +112,9 @@ class FakeOrderLine():
         """
         return qty
 
+    def __getattr__(self, item):
+        return False
+
 
 class FakeSaleOrder():
     """
@@ -144,6 +150,9 @@ class FakeSaleOrder():
         """
         yield self
 
+    def __getattr__(self, item):
+        return False
+
 
 def distance(lat_1, lon_1, lat_2, lon_2):
     R = 6373.0

From 4e4fd80006e8462d3214f45de050de16e1026380 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Mon, 15 Jul 2019 12:29:38 -0700
Subject: [PATCH 04/13] IMP `order_planner` allow subscription access to Fakes

---
 sale_planner/wizard/order_planner.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sale_planner/wizard/order_planner.py b/sale_planner/wizard/order_planner.py
index 50a2fca6..0aa907a3 100644
--- a/sale_planner/wizard/order_planner.py
+++ b/sale_planner/wizard/order_planner.py
@@ -82,6 +82,11 @@ class FakePartner():
     def __getattr__(self, item):
         return False
 
+    def __getitem__(self, item):
+        if item == '__last_update':
+            return str(datetime.now())
+        return getattr(self, item)
+
 
 class FakeOrderLine():
     def __init__(self, **kwargs):
@@ -115,6 +120,11 @@ class FakeOrderLine():
     def __getattr__(self, item):
         return False
 
+    def __getitem__(self, item):
+        if item == '__last_update':
+            return str(datetime.now())
+        return getattr(self, item)
+
 
 class FakeSaleOrder():
     """
@@ -153,6 +163,11 @@ class FakeSaleOrder():
     def __getattr__(self, item):
         return False
 
+    def __getitem__(self, item):
+        if item == '__last_update':
+            return str(datetime.now())
+        return getattr(self, item)
+
 
 def distance(lat_1, lon_1, lat_2, lon_2):
     R = 6373.0

From decf665a692c20105b745435fb5828d3edae1a43 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Tue, 16 Jul 2019 15:07:41 -0700
Subject: [PATCH 05/13] IMP `sale_planner` FakePartner now provides a
 FakePartner parent_id

---
 sale_planner/wizard/order_planner.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sale_planner/wizard/order_planner.py b/sale_planner/wizard/order_planner.py
index 0aa907a3..04565c40 100644
--- a/sale_planner/wizard/order_planner.py
+++ b/sale_planner/wizard/order_planner.py
@@ -51,6 +51,8 @@ class FakePartner():
         self.partner_longitude = 0.0
         self.is_company = False
         self._date_localization = kwargs.pop('date_localization', False)
+        if not kwargs.pop('PARENT', False):
+            self.parent_id = FakePartner(PARENT=True)
         for attr, value in kwargs.items():
             setattr(self, attr, value)
 

From aaef8b8f228a4121fdc7f405fe3eebe9a40fa2a5 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Tue, 16 Jul 2019 15:57:05 -0700
Subject: [PATCH 06/13] IMP `auth_admin` Make it easier to select the long url.

---
 auth_admin/wizard/portal_wizard_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auth_admin/wizard/portal_wizard_views.xml b/auth_admin/wizard/portal_wizard_views.xml
index 78e37b21..ef9b7992 100755
--- a/auth_admin/wizard/portal_wizard_views.xml
+++ b/auth_admin/wizard/portal_wizard_views.xml
@@ -7,7 +7,7 @@
         <field name="inherit_id" ref="portal.wizard_view"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='in_portal']" position="after">
-                <field name="force_login_url" readonly="1"/>
+                <field name="force_login_url"/>
             </xpath>
             <xpath expr="//button[last()]" position="after">
                 <button string="Generate Login URL" type="object" name="admin_auth_generate_login" class="btn-default" />

From 26e0112490133b32eed38f8a5237d040587885f9 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Wed, 17 Jul 2019 13:27:39 -0700
Subject: [PATCH 07/13] IMP `sale_planner` log as info instead of error, and
 fix 'date' underflow.

---
 sale_planner/wizard/order_planner.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/sale_planner/wizard/order_planner.py b/sale_planner/wizard/order_planner.py
index 04565c40..8fa84412 100644
--- a/sale_planner/wizard/order_planner.py
+++ b/sale_planner/wizard/order_planner.py
@@ -363,9 +363,9 @@ class SaleOrderMakePlan(models.TransientModel):
             #order_fake.warehouse_id = warehouse
             return {'warehouse_id': warehouse.id, 'date_planned': date_planned}
 
-        _logger.error('      partial_candidates: ' + str(partial_candidates))
+        _logger.info('      partial_candidates: ' + str(partial_candidates))
         if partial_candidates:
-            _logger.error('      using...')
+            _logger.info('      using...')
             if len(partial_candidates) == 1:
                 warehouse = warehouses.filtered(lambda wh: wh.id in partial_candidates)
                 #order_fake.warehouse_id = warehouse
@@ -373,17 +373,17 @@ class SaleOrderMakePlan(models.TransientModel):
 
             sorted_warehouses = self._sort_warehouses_by_partner(
                 warehouses.filtered(lambda wh: wh.id in partial_candidates), order_fake.partner_shipping_id)
-            _logger.error('      sorted_warehouses: ' + str(sorted_warehouses) + ' warehouses: ' + str(warehouses))
+            _logger.info('      sorted_warehouses: ' + str(sorted_warehouses) + ' warehouses: ' + str(warehouses))
             primary_wh = sorted_warehouses[0]  # partial_candidates means there is at least one warehouse
             primary_wh_date_planned = self._next_warehouse_shipping_date(primary_wh)
             wh_date_planning[primary_wh.id] = primary_wh_date_planned
             for wh in sorted_warehouses:
-                _logger.error('      wh: ' + str(wh) + ' buy_qty: ' + str(policy_group['buy_qty']))
+                _logger.info('      wh: ' + str(wh) + ' buy_qty: ' + str(policy_group['buy_qty']))
                 if not policy_group['buy_qty']:
                     continue
                 stock = product_stock[wh.id]
                 for p_id, p_vals in stock.items():
-                    _logger.error('      p_id: ' + str(p_id) + ' p_vals: ' + str(p_vals))
+                    _logger.info('      p_id: ' + str(p_id) + ' p_vals: ' + str(p_vals))
                     if p_id in policy_group['buy_qty'] and self._is_in_stock(p_vals, policy_group['buy_qty'][p_id]):
                         if wh.id not in sub_options:
                             sub_options[wh.id] = {
@@ -393,7 +393,7 @@ class SaleOrderMakePlan(models.TransientModel):
                             }
                         sub_options[wh.id]['product_ids'].append(p_id)
                         sub_options[wh.id]['product_skus'].append(p_vals['sku'])
-                        _logger.error('        removing: ' + str(p_id))
+                        _logger.info('        removing: ' + str(p_id))
                         del policy_group['buy_qty'][p_id]
 
             if not policy_group['buy_qty']:
@@ -413,7 +413,7 @@ class SaleOrderMakePlan(models.TransientModel):
         return {'warehouse_id': primary_wh.id}
 
     def generate_base_option(self, order_fake):
-        _logger.error('generate_base_option:')
+        _logger.info('generate_base_option:')
         product_lines = list(filter(lambda line: line.product_id.type == 'product', order_fake.order_line))
         if not product_lines:
             return {}
@@ -449,7 +449,7 @@ class SaleOrderMakePlan(models.TransientModel):
         option_policy_groups = defaultdict(lambda: {'products': self.env['product.product'].browse(), 'policies': self.env['sale.order.planning.policy'].browse(), 'date_planned': '1900', 'sub_options': [],})
         for policy_id, policy_group in policy_groups.items():
             base_option = policy_group['base_option']
-            _logger.error('  base_option: ' + str(base_option))
+            _logger.info('  base_option: ' + str(base_option))
             b_wh_id = base_option['warehouse_id']
             if 'policy' in policy_group:
                 option_policy_groups[b_wh_id]['policies'] += policy_group['policy']
@@ -495,8 +495,8 @@ class SaleOrderMakePlan(models.TransientModel):
         # Collapse warehouse options.
         base_option = {'date_planned': '1900', 'products': self.env['product.product'].browse()}
         for wh_id, intermediate_option in option_policy_groups.items():
-            _logger.error('    base_option: ' + str(base_option))
-            _logger.error('    intermediate_option: ' + str(intermediate_option))
+            _logger.info('    base_option: ' + str(base_option))
+            _logger.info('    intermediate_option: ' + str(intermediate_option))
             if 'warehouse_id' not in base_option:
                 base_option['warehouse_id'] = wh_id
             b_wh_id = base_option['warehouse_id']
@@ -594,7 +594,7 @@ class SaleOrderMakePlan(models.TransientModel):
                                 base_option['sub_options'][o_wh_id]['date_planned'] = intermediate_option['date_planned']
 
         del base_option['products']
-        _logger.error('  returning: ' + str(base_option))
+        _logger.info('  returning: ' + str(base_option))
         order_fake.warehouse_id = self.get_warehouses(warehouse_id=base_option['warehouse_id'])
         return base_option
 
@@ -623,7 +623,7 @@ class SaleOrderMakePlan(models.TransientModel):
 
     def _next_warehouse_shipping_date(self, warehouse):
         if warehouse.shipping_calendar_id:
-            return fields.Datetime.to_string(warehouse.shipping_calendar_id.plan_days(0.01, fields.Datetime.from_string(fields.Datetime.now()), compute_leaves=True))
+            return fields.Datetime.to_string(warehouse.shipping_calendar_id.plan_days(1.0, fields.Datetime.from_string(fields.Datetime.now()), compute_leaves=True))
         return False
 
     @api.model

From e412b39d129c7d5608b7d62f308e33830c741d2f Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Wed, 17 Jul 2019 15:15:09 -0700
Subject: [PATCH 08/13] FIX `sale_planner` When planning dates for a warehouse,
 need to check if it is in the past.

---
 sale_planner/wizard/order_planner.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sale_planner/wizard/order_planner.py b/sale_planner/wizard/order_planner.py
index 8fa84412..c3308c66 100644
--- a/sale_planner/wizard/order_planner.py
+++ b/sale_planner/wizard/order_planner.py
@@ -623,7 +623,11 @@ class SaleOrderMakePlan(models.TransientModel):
 
     def _next_warehouse_shipping_date(self, warehouse):
         if warehouse.shipping_calendar_id:
-            return fields.Datetime.to_string(warehouse.shipping_calendar_id.plan_days(1.0, fields.Datetime.from_string(fields.Datetime.now()), compute_leaves=True))
+            now = fields.Datetime.from_string(fields.Datetime.now())
+            then = warehouse.shipping_calendar_id.plan_days(0.01, fields.Datetime.from_string(fields.Datetime.now()), compute_leaves=True)
+            if then < now:
+                then = warehouse.shipping_calendar_id.plan_days(1.01, fields.Datetime.from_string(fields.Datetime.now()), compute_leaves=True)
+            return fields.Datetime.to_string(then)
         return False
 
     @api.model

From 9054ace961474a6ca1ade730a712e91237f41f59 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Fri, 19 Jul 2019 13:12:44 -0700
Subject: [PATCH 09/13] Include `purchase_delivery_split_date` from OCA
 purchase-workflow for 11.0

---
 external/hibou-oca/purchase-workflow | 2 +-
 purchase_delivery_split_date         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 120000 purchase_delivery_split_date

diff --git a/external/hibou-oca/purchase-workflow b/external/hibou-oca/purchase-workflow
index 5973bb87..f04a7f39 160000
--- a/external/hibou-oca/purchase-workflow
+++ b/external/hibou-oca/purchase-workflow
@@ -1 +1 @@
-Subproject commit 5973bb878baba5656d08067079e07edd1ec6accc
+Subproject commit f04a7f3908b180e35324baac437a6de973ba8f6a
diff --git a/purchase_delivery_split_date b/purchase_delivery_split_date
new file mode 120000
index 00000000..24c09b10
--- /dev/null
+++ b/purchase_delivery_split_date
@@ -0,0 +1 @@
+external/hibou-oca/purchase-workflow/purchase_delivery_split_date
\ No newline at end of file

From c3a56fcc8c8b7d2689f922014375d38654cb55e3 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Thu, 25 Jul 2019 15:20:09 -0700
Subject: [PATCH 10/13] IMP `delivery_partner_dhl` Allow 8-10 digit account
 numbers.

---
 delivery_partner_dhl/models/delivery.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/delivery_partner_dhl/models/delivery.py b/delivery_partner_dhl/models/delivery.py
index ceb51651..6de6583a 100644
--- a/delivery_partner_dhl/models/delivery.py
+++ b/delivery_partner_dhl/models/delivery.py
@@ -10,8 +10,8 @@ class PartnerShippingAccount(models.Model):
     delivery_type = fields.Selection(selection_add=[('dhl', 'DHL')])
 
     def dhl_check_validity(self):
-        m = re.search('^\d{10}$', self.name or '')
+        m = re.search(r'^(\d{8}|\d{9}|\d{10})$', self.name or '')
         if not m:
-            raise ValidationError('DHL Account numbers must be 10 decimal numbers.')
+            raise ValidationError('DHL Account numbers must be 8-10 decimal numbers.')
 
 

From 4a05d8397fdcc1a8c79979d1bb52d48af9879043 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Wed, 20 May 2020 15:43:13 -0700
Subject: [PATCH 11/13] [ADD] hibou_professional: for Odoo 11

---
 hibou_professional/__init__.py                |   3 +
 hibou_professional/__manifest__.py            |  24 ++
 hibou_professional/models/__init__.py         |   3 +
 hibou_professional/models/update.py           | 210 +++++++++++++
 hibou_professional/static/src/css/web.css     |  30 ++
 .../static/src/img/hibou_icon_small.png       | Bin 0 -> 2483 bytes
 hibou_professional/static/src/js/core.js      | 275 ++++++++++++++++++
 .../static/src/xml/templates.xml              | 142 +++++++++
 .../views/webclient_templates.xml             |  11 +
 9 files changed, 698 insertions(+)
 create mode 100644 hibou_professional/__init__.py
 create mode 100644 hibou_professional/__manifest__.py
 create mode 100644 hibou_professional/models/__init__.py
 create mode 100644 hibou_professional/models/update.py
 create mode 100644 hibou_professional/static/src/css/web.css
 create mode 100644 hibou_professional/static/src/img/hibou_icon_small.png
 create mode 100644 hibou_professional/static/src/js/core.js
 create mode 100644 hibou_professional/static/src/xml/templates.xml
 create mode 100644 hibou_professional/views/webclient_templates.xml

diff --git a/hibou_professional/__init__.py b/hibou_professional/__init__.py
new file mode 100644
index 00000000..09434554
--- /dev/null
+++ b/hibou_professional/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import models
diff --git a/hibou_professional/__manifest__.py b/hibou_professional/__manifest__.py
new file mode 100644
index 00000000..cc1eaec2
--- /dev/null
+++ b/hibou_professional/__manifest__.py
@@ -0,0 +1,24 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+{
+    'name': 'Hibou Professional',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'category': 'Tools',
+    'depends': ['mail'],
+    'version': '11.0.1.0.0',
+    'description': """
+Hibou Professional Support and Billing
+======================================
+
+    """,
+    'website': 'https://hibou.io/',
+    'data': [
+        'views/webclient_templates.xml',
+    ],
+    'qweb': [
+        'static/src/xml/templates.xml',
+    ],
+    'installable': True,
+    'auto_install': True,
+    'license': 'OPL-1',
+}
diff --git a/hibou_professional/models/__init__.py b/hibou_professional/models/__init__.py
new file mode 100644
index 00000000..1ae9ad83
--- /dev/null
+++ b/hibou_professional/models/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import update
diff --git a/hibou_professional/models/update.py b/hibou_professional/models/update.py
new file mode 100644
index 00000000..a52e2717
--- /dev/null
+++ b/hibou_professional/models/update.py
@@ -0,0 +1,210 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+import datetime
+import requests
+
+from odoo import api, fields, models, release
+from odoo.exceptions import UserError
+
+
+class PublisherWarrantyContract(models.AbstractModel):
+    _inherit = 'publisher_warranty.contract'
+    # CONFIG_HIBOU_URL = 'https://hibou.io/hibouapi/v1/professional'
+    CONFIG_HIBOU_URL = 'https://odoo-hibou-test12.hibou-test-odoo.us-w-p1.hibou.me/hibouapi/v1/professional'
+    # CONFIG_HIBOU_MESSAGE_URL = 'https://hibou.io/hibouapi/v1/professional/message'
+    CONFIG_HIBOU_MESSAGE_URL = 'https://odoo-hibou-test12.hibou-test-odoo.us-w-p1.hibou.me/hibouapi/v1/professional/message'
+    # CONFIG_HIBOU_QUOTE_URL = 'https://hibou.io/hibouapi/v1/professional/quote'
+    CONFIG_HIBOU_QUOTE_URL = 'https://odoo-hibou-test12.hibou-test-odoo.us-w-p1.hibou.me/hibouapi/v1/professional/quote'
+    DAYS_ENDING_SOON = 7
+
+    @api.model
+    def hibou_professional_status(self):
+        get_param = self.env['ir.config_parameter'].sudo().get_param
+        expiration_date = get_param('database.hibou_professional_expiration_date')
+        expiration_reason = get_param('database.hibou_professional_expiration_reason')
+        dbuuid = get_param('database.uuid')
+        expiring = False
+        expired = False
+        if expiration_date:
+            expiration_date_date = fields.Date.from_string(expiration_date)
+            today = fields.Date.from_string(fields.Date.today())
+            if expiration_date_date < today:
+                if expiration_reason == 'trial':
+                    expired = 'Your trial of Hibou Professional has ended.'
+                else:
+                    expired = 'Your Hibou Professional subscription has ended.'
+            elif expiration_date_date < (today + datetime.timedelta(days=self.DAYS_ENDING_SOON)):
+                if expiration_reason == 'trial':
+                    expiring = 'Your trial of Hibou Professional is ending soon.'
+                else:
+                    expiring = 'Your Hibou Professional subscription is ending soon.'
+
+        is_admin = self.env.user.has_group('base.group_erp_manager')
+        allow_admin_message = get_param('database.hibou_allow_admin_message')
+        allow_message = get_param('database.hibou_allow_message')
+
+        return {
+            'expiration_date': get_param('database.hibou_professional_expiration_date'),
+            'expiration_reason': get_param('database.hibou_professional_expiration_reason'),
+            'expiring': expiring,
+            'expired': expired,
+            'professional_code': get_param('database.hibou_professional_code'),
+            'dbuuid': dbuuid,
+            'is_admin': is_admin,
+            'allow_admin_message': allow_admin_message,
+            'allow_message': allow_message,
+        }
+
+    @api.model
+    def hibou_professional_update_message_preferences(self, allow_admin_message, allow_message):
+        if self.env.user.has_group('base.group_erp_manager'):
+            set_param = self.env['ir.config_parameter'].sudo().set_param
+            set_param('database.hibou_allow_admin_message', allow_admin_message and '1')
+            set_param('database.hibou_allow_message', allow_message and '1')
+        return self.hibou_professional_status()
+
+    def _check_message_allow(self):
+        get_param = self.env['ir.config_parameter'].sudo().get_param
+        allow_message = get_param('database.hibou_allow_message')
+        if not allow_message:
+            allow_message = get_param('database.hibou_allow_admin_message') and self.env.user.has_group(
+                'base.group_erp_manager')
+            if not allow_message:
+                raise UserError('You are not allowed to send messages at this time.')
+
+    @api.model
+    def hibou_professional_quote(self):
+        get_param = self.env['ir.config_parameter'].sudo().get_param
+        try:
+            self._hibou_install()
+        except:
+            pass
+        dbuuid = get_param('database.uuid')
+        dbtoken = get_param('database.hibou_token')
+        if dbuuid and dbtoken:
+            return {'url': self.CONFIG_HIBOU_QUOTE_URL + '/%s/%s' % (dbuuid, dbtoken)}
+        return {}
+
+    @api.model
+    def hibou_professional_send_message(self, type, priority, subject, body, user_url, res_id):
+        self._check_message_allow()
+        get_param = self.env['ir.config_parameter'].sudo().get_param
+        dbuuid = get_param('database.uuid')
+        dbtoken = get_param('database.hibou_token')
+        user_name = self.env.user.name
+        user_email = self.env.user.email or self.env.user.login
+        company_name = self.env.user.company_id.name
+        data = {
+            'jsonrpc': '2.0',
+            'method': 'call',
+            'params': {
+                'dbuuid': dbuuid,
+                'user_name': user_name,
+                'user_email': user_email,
+                'user_url': user_url,
+                'company_name': company_name,
+                'type': type,
+                'priority': priority,
+                'subject': subject,
+                'body': body,
+                'res_id': res_id,
+            },
+        }
+        if dbtoken:
+            data['params']['dbtoken'] = dbtoken
+        try:
+            r = requests.post(self.CONFIG_HIBOU_MESSAGE_URL + '/new', json=data, timeout=30)
+            r.raise_for_status()
+            wrapper = r.json()
+            return wrapper.get('result', {})
+        except:
+            return {'error': 'Error sending message.'}
+
+    @api.model
+    def hibou_professional_get_messages(self):
+        self._check_message_allow()
+        get_param = self.env['ir.config_parameter'].sudo().get_param
+        dbuuid = get_param('database.uuid')
+        dbtoken = get_param('database.hibou_token')
+        try:
+            r = requests.get(self.CONFIG_HIBOU_MESSAGE_URL + '/get/%s/%s' % (dbuuid, dbtoken), timeout=30)
+            r.raise_for_status()
+            # not jsonrpc
+            return r.json()
+        except:
+            return {'error': 'Error retrieving messages, maybe the token is wrong.'}
+
+    @api.model
+    def hibou_professional_update(self, professional_code):
+        set_param = self.env['ir.config_parameter'].sudo().set_param
+        set_param('database.hibou_professional_code', professional_code)
+        try:
+            self._hibou_install()
+        except:
+            pass
+        return self.hibou_professional_status()
+
+    def _get_hibou_modules(self):
+        domain = [('state', 'in', ['installed', 'to upgrade', 'to remove']), ('author', 'ilike', 'hibou')]
+        module_list = self.env['ir.module.module'].sudo().search_read(domain, ['name'])
+        return {module['name']: 1 for module in module_list}
+
+    def _get_hibou_message(self):
+        IrParamSudo = self.env['ir.config_parameter'].sudo()
+
+        dbuuid = IrParamSudo.get_param('database.uuid')
+        dbtoken = IrParamSudo.get_param('database.hibou_token')
+        db_create_date = IrParamSudo.get_param('database.create_date')
+        user = self.env.user.sudo()
+        professional_code = IrParamSudo.get_param('database.hibou_professional_code')
+
+        module_dictionary = self._get_hibou_modules()
+        modules = []
+        for module, qty in module_dictionary.items():
+            modules.append(module if qty == 1 else '%s,%s' % (module, qty))
+
+        web_base_url = IrParamSudo.get_param('web.base.url')
+        msg = {
+            "dbuuid": dbuuid,
+            "dbname": self._cr.dbname,
+            "db_create_date": db_create_date,
+            "version": release.version,
+            "language": user.lang,
+            "web_base_url": web_base_url,
+            "modules": '\n'.join(modules),
+            "professional_code": professional_code,
+        }
+        if dbtoken:
+            msg['dbtoken'] = dbtoken
+        msg.update({'company_' + key: value for key, value in user.company_id.read(["name", "email", "phone"])[0].items() if key != 'id'})
+        return msg
+
+    def _process_hibou_message(self, result):
+        if result.get('professional_info'):
+            set_param = self.env['ir.config_parameter'].sudo().set_param
+            set_param('database.hibou_professional_expiration_date', result['professional_info'].get('expiration_date'))
+            set_param('database.hibou_professional_expiration_reason', result['professional_info'].get('expiration_reason', 'trial'))
+            if result['professional_info'].get('professional_code'):
+                set_param('database.hibou_professional_code', result['professional_info'].get('professional_code'))
+            if result['professional_info'].get('dbtoken'):
+                set_param('database.hibou_token', result['professional_info'].get('dbtoken'))
+
+    def _hibou_install(self):
+        data = self._get_hibou_message()
+        data = {
+            'jsonrpc': '2.0',
+            'method': 'call',
+            'params': data,
+        }
+        r = requests.post(self.CONFIG_HIBOU_URL, json=data, timeout=30)
+        r.raise_for_status()
+        wrapper = r.json()
+        self._process_hibou_message(wrapper.get('result', {}))
+
+    @api.model
+    def _get_sys_logs(self):
+        try:
+            self._hibou_install()
+        except:
+            pass
+        return super(PublisherWarrantyContract, self)._get_sys_logs()
diff --git a/hibou_professional/static/src/css/web.css b/hibou_professional/static/src/css/web.css
new file mode 100644
index 00000000..05211e2a
--- /dev/null
+++ b/hibou_professional/static/src/css/web.css
@@ -0,0 +1,30 @@
+.hibou_professional_systray {
+    color: #666;
+}
+.hibou_professional_systray .o_mail_systray_dropdown {
+    max-height: 580px !important;
+}
+.hibou_professional_systray .o_mail_systray_dropdown_items {
+    max-height: 578px !important;
+}
+.hibou_professional_systray .subscription_form button {
+    margin-top: 6px;
+}
+
+.hibou_professional_systray .hibou-icon-small {
+    margin-top: -2px;
+}
+
+.hibou_professional_systray .hibou_professional_help {
+    color: #0a6fa2;
+}
+
+.hibou_professional_systray .o_preview_title span {
+    font-weight: bold;
+}
+
+.hibou_professional_systray .hibou_message_form_container,
+.hibou_professional_systray .subscription_form,
+.hibou_professional_systray .message_preferences_form {
+    padding: 3px 20px;
+}
\ No newline at end of file
diff --git a/hibou_professional/static/src/img/hibou_icon_small.png b/hibou_professional/static/src/img/hibou_icon_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ea52f7ee8c9b48364baf8ed8da4e69e73c72bf2
GIT binary patch
literal 2483
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

literal 0
HcmV?d00001

diff --git a/hibou_professional/static/src/js/core.js b/hibou_professional/static/src/js/core.js
new file mode 100644
index 00000000..2545025a
--- /dev/null
+++ b/hibou_professional/static/src/js/core.js
@@ -0,0 +1,275 @@
+odoo.define('hibou_professional.core', function (require) {
+"use strict";
+
+var Widget = require('web.Widget');
+var SystrayMenu = require('web.SystrayMenu');
+
+var HibouProfessionalSystrayWidget = Widget.extend({
+    template: 'HibouProfessionalSystrayWidget',
+
+    start: function() {
+        var self = this;
+        self.expiration_date = false;
+        self.expiration_reason = false;
+        self.professional_code = false;
+        this.types = [['lead', 'Sales'], ['ticket', 'Support']];
+        this.message_subjects = {'lead': [], 'ticket': [], 'task': []};
+        self.expiring = false;
+        self.expired = false;
+        self.dbuuid = false;
+        self.quote_url = false;
+        self.is_admin = false;
+        self.allow_admin_message = false;
+        self.allow_message = false;
+        this._rpc({
+            model: 'publisher_warranty.contract',
+            method: 'hibou_professional_status',
+        }).then(function (result) {
+            self.handleStatusUpdate(result);
+        });
+        return this._super();
+    },
+
+    get_subjects: function(type) {
+        if (this.message_subjects && this.message_subjects[type]) {
+            return this.message_subjects[type]
+        }
+        return [];
+    },
+
+    set_error: function(error) {
+        this.$('.hibou_professional_error').text(error);
+    },
+
+    update_message_type: function(el) {
+        var selected_type = this.$('select.hibou_message_type').val();
+        if (selected_type && this.$('.hibou_subject_selection_option.' + selected_type).length > 0) {
+            this.$('#hibou_subject_selection').show();
+            this.$('.hibou_subject_selection_option').hide().attr('disabled', true);
+            this.$('.hibou_subject_selection_option.' + selected_type).show().attr('disabled', false);
+            var selected_subject = this.$('.hibou_subject_selection_option.' + selected_type)[0];
+            this.$('select.hibou_subject_selection').val(selected_subject.value);
+        } else if (selected_type) {
+            this.$('select.hibou_subject_selection').val('0');
+            this.$('#hibou_subject_selection').hide();
+        } else {
+            this.$('#hibou_subject_selection').hide();
+            this.$('#hibou_message_priority').hide();
+            this.$('#hibou_message_subject').hide();
+        }
+        this.update_subject_selection();
+    },
+
+    update_subject_selection: function(el) {
+        var selected_subject = this.$('select.hibou_subject_selection').val();
+        if (selected_subject == '0') {
+            this.$('#hibou_message_priority').show();
+            this.$('#hibou_message_subject').show();
+        } else {
+            this.$('#hibou_message_priority').hide();
+            this.$('#hibou_message_subject').hide();
+        }
+    },
+
+    update_message_subjects: function(subjects_by_type) {
+        // TODO actually update instead of overriding...
+        this.message_subjects = subjects_by_type;
+        this.renderElement();
+    },
+
+    button_update_subscription: function() {
+        var self = this;
+        var professional_code = self.$('input.hibou_professional_code').val();
+        if (!professional_code) {
+            alert('Please enter a subscription code first.');
+            return;
+        }
+        self.$('.update_subscription').prop('disabled', 'disabled');
+        self._rpc({
+            model: 'publisher_warranty.contract',
+            method: 'hibou_professional_update',
+            args: [professional_code],
+        }).then(function (result) {
+            self.$('.update_subscription').prop('disabled', false);
+            self.handleStatusUpdate(result);
+        });
+    },
+
+    button_update_message_preferences: function() {
+        var self = this;
+        var allow_admin_message = self.$('input.hibou_allow_admin_message').prop('checked');
+        var allow_message = self.$('input.hibou_allow_message').prop('checked');
+        self.$('.update_message_preferences').prop('disabled', 'disabled');
+        self._rpc({
+            model: 'publisher_warranty.contract',
+            method: 'hibou_professional_update_message_preferences',
+            args: [allow_admin_message, allow_message],
+        }).then(function (result) {
+            self.$('.update_message_preferences').prop('disabled', false);
+            self.handleStatusUpdate(result);
+        });
+    },
+
+    button_quote: function() {
+        var self = this;
+        var message_p = self.$('.button-quote-link p');
+        message_p.text('Retrieving URL...');
+        self._rpc({
+            model: 'publisher_warranty.contract',
+            method: 'hibou_professional_quote',
+        }).then(function (result) {
+            if (result && result['url']) {
+                self.quote_url = result.url
+                self.$('.button-quote-link').attr('href', self.quote_url);
+                message_p.text('Quote URL ready. Click again!');
+            } else {
+                message_p.text('Error with quote url.  Maybe the database token is incorrect.');
+            }
+        });
+    },
+
+    button_send_message: function() {
+        var self = this;
+        var message_type = self.$('select.hibou_message_type').val();
+        var message_priority = self.$('select.hibou_message_priority').val();
+        var message_subject = self.$('input.hibou_message_subject').val();
+        var message_subject_id = self.$('select.hibou_subject_selection').val();
+        var current_url = window.location.href;
+        if (message_subject_id == '0' && (!message_subject || message_subject.length < 3)) {
+            alert('Please enter a longer subject.');
+            return;
+        }
+        var message_body = self.$('textarea.hibou_message_body').val();
+        self.$('.hibou_send_message').prop('disabled', 'disabled');
+        self._rpc({
+            model: 'publisher_warranty.contract',
+            method: 'hibou_professional_send_message',
+            args: [message_type, message_priority, message_subject, message_body, current_url, message_subject_id],
+        }).then(function (result) {
+            // TODO result will have a subject to add to the subjects and re-render.
+            self.$('.hibou_send_message').prop('disabled', false);
+            var message_response = self.$('.hibou_message_response');
+            var access_link = self.$('.hibou_message_response a');
+            var message_form = self.$('.hibou_message_form');
+            if (!result) {
+                access_link.text('An error has occured.')
+            } else {
+                if (result.error) {
+                    access_link.text(result.error);
+                } else {
+                    access_link.text(result.message || 'Your message has been received.')
+                }
+                if (result.access_url) {
+                access_link.attr('href', result.access_url);
+                }
+            }
+            message_response.show();
+            message_form.hide();
+        });
+    },
+
+    button_get_messages: function() {
+        var self = this;
+        var $button = this.$('.hibou_get_messages');
+        $button.prop('disabled', 'disabled');
+        self._rpc({
+            model: 'publisher_warranty.contract',
+            method: 'hibou_professional_get_messages',
+            args: [],
+        }).then(function (result) {
+            $button.prop('disabled', false);
+            if (result['message_subjects']) {
+                self.update_message_subjects(result.message_subjects);
+                setTimeout(function () {
+                    self.$('.dropdown-toggle').click();
+                }, 100);
+            } else if (result['error']) {
+                self.set_error(result['error']);
+            }
+        });
+    },
+
+    renderElement: function() {
+        var self = this;
+        this._super();
+
+        this.update_message_type();
+        this.update_subject_selection();
+
+        this.$('select.hibou_message_type').on('change', function(el) {
+            self.update_message_type(el);
+        });
+        this.$('select.hibou_subject_selection').on('change', function(el) {
+            self.update_subject_selection(el);
+        });
+
+        // Update Subscription Button
+        this.$('.update_subscription').on('click', function(e){
+            e.preventDefault();
+            e.stopPropagation();
+            self.button_update_subscription();
+        });
+
+        this.$('.hibou_get_messages').on('click', function(e){
+            e.preventDefault();
+            e.stopPropagation();
+            self.button_get_messages();
+        });
+
+        // Retrieve quote URL
+        this.$('.button-quote-link').on('click', function(e){
+            if (self.quote_url) {
+                return;  // allow default url click event
+            }
+            e.preventDefault();
+            e.stopPropagation();
+            self.button_quote();
+        });
+
+        // Update Message Preferences Button
+        this.$('.update_message_preferences').on('click', function(e){
+            e.preventDefault();
+            e.stopPropagation();
+            self.button_update_message_preferences();
+        });
+
+        // Send Message Button
+        this.$('.hibou_send_message').on('click', function(e){
+            e.preventDefault();
+            e.stopPropagation();
+            self.button_send_message();
+        });
+
+        // Kill the default click event
+        this.$('.hibou_message_form_container').on('click', function (e) {
+            //e.preventDefault();
+            e.stopPropagation();
+        })
+    },
+
+    handleStatusUpdate: function(status) {
+        this.expiration_date = status.expiration_date;
+        this.expiration_reason = status.expiration_reason;
+        this.professional_code = status.professional_code;
+        this.types = [['lead', 'Sales'], ['ticket', 'Support']];
+        if (this.professional_code) {
+            this.types.push(['task', 'Project Manager/Developer'])
+        }
+        this.expiring = status.expiring;
+        this.expired = status.expired;
+        this.dbuuid = status.dbuuid;
+        this.is_admin = status.is_admin;
+        this.allow_admin_message = status.allow_admin_message;
+        this.allow_message = status.allow_message;
+        this.renderElement();
+    },
+
+});
+
+SystrayMenu.Items.push(HibouProfessionalSystrayWidget);
+
+return {
+    HibouProfessionalSystrayWidget: HibouProfessionalSystrayWidget,
+};
+
+});
\ No newline at end of file
diff --git a/hibou_professional/static/src/xml/templates.xml b/hibou_professional/static/src/xml/templates.xml
new file mode 100644
index 00000000..41b45328
--- /dev/null
+++ b/hibou_professional/static/src/xml/templates.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="HibouProfessionalSystrayWidget">
+        <li class="hibou_professional_systray o_mail_systray_item">
+            <a class="dropdown-toggle o-no-caret" data-toggle="dropdown" aria-expanded="false" data-flip="false" data-display="static" href="#">
+                <img t-if="! (widget.expiring || widget.expired)" class="hibou-icon-small" width="16px" height="16px" src="hibou_professional/static/src/img/hibou_icon_small.png" alt="Hibou Icon"/>
+                <i class="fa fa-exclamation-triangle" t-if="widget.expiring || widget.expired"/>
+                <span class="expiration_message" t-if="widget.expiring" t-esc="widget.expiring"/>
+                <span class="expiration_message" t-if="widget.expired" t-esc="widget.expired"/>
+            </a>
+            <ul class="dropdown-menu o_mail_navbar_dropdown" role="menu">
+                <li class="o_mail_navbar_dropdown_channels">
+                    <a href="https://odoo-hibou-test12.hibou-test-odoo.us-w-p1.hibou.me/help?utm_source=db&amp;utm_medium=help" target="_blank">
+<!--                    <a href="https://hibou.io/help?utm_source=db&amp;utm_medium=help" target="_blank">-->
+                        <div class="o_mail_channel_preview">
+                            <div class="o_preview_info">
+                                <div class="o_preview_title">
+                                    <span class="o_preview_name hibou_professional_help">
+                                        Hibou Professional Help
+                                    </span>
+                                </div>
+                                <div>
+                                    <p>We're here to help!<br/>Click here to review Hibou's help resources or to contact us today.</p>
+                                </div>
+                                <div class="text-danger hibou_professional_error"/>
+                            </div>
+                        </div>
+                    </a>
+                    <div t-if="widget.allow_message || (widget.allow_admin_message &amp;&amp; widget.is_admin)" class="o_mail_channel_preview hibou_message_form_container">
+                        <div class="o_preview_info">
+                            <div class="o_preview_title">
+                                <p>
+                                    <span>Talk to Hibou!</span>
+                                </p>
+                                <p class="get_messages">
+                                    <br/>
+                                    <button class="hibou_get_messages btn btn-secondary btn-sm">Retrieve Recent Subjects</button>
+                                </p>
+                            </div>
+                            <div class="hibou_message_form">
+                                <t t-set="subject_types" t-value="widget.types"/>
+                                <p>
+                                    <label for="hibou_message_type">Who do you want to talk to?</label>
+                                    <select class="hibou_message_type form-control" name="hibou_message_type">
+                                        <t t-foreach="subject_types" t-as="type">
+                                            <option t-attf-value="#{type[0]}">
+                                                <span t-esc="type[1]"/>
+                                            </option>
+                                        </t>
+                                    </select>
+                                </p>
+                                <p id="hibou_subject_selection">
+                                    <label for="hibou_subject_selection">Update Existing</label>
+                                    <select class="hibou_subject_selection form-control" name="hibou_subject_selection">
+                                        <t t-foreach="subject_types" t-as="type">
+                                            <t t-foreach="widget.get_subjects(type[0])" t-as="subject">
+                                                <option t-attf-value="#{subject[0]}" t-attf-class="hibou_subject_selection_option #{type[0]}">
+                                                    <span  t-esc="subject[1]"/>
+                                                </option>
+                                            </t>
+                                        </t>
+                                        <option value="0">New</option>
+                                    </select>
+                                </p>
+                                <p id="hibou_message_priority">
+                                    <label for="hibou_message_priority">Priority</label>
+                                    <select class="hibou_message_priority form-control" name="hibou_message_priority">
+                                        <option value="0">Low priority</option>
+                                        <option value="1">Medium priority</option>
+                                        <option value="2">High priority</option>
+                                        <option value="3">Urgent</option>
+                                    </select>
+                                </p>
+                                <p id="hibou_message_subject">
+                                    <label for="hibou_message_subject">Subject</label>
+                                    <input type="text" class="hibou_message_subject form-control" name="hibou_message_subject"/>
+                                </p>
+                                <p>
+                                    <p>You can use <a href="https://www.markdownguide.org/cheat-sheet/" target="_blank">Markdown</a> for formatting.</p>
+                                    <textarea rows="5" class="hibou_message_body form-control" name="hibou_message_body"/>
+                                </p>
+                                <button type="submit" class="hibou_send_message btn btn-primary">Send</button>
+                            </div>
+                            <div class="hibou_message_response" style="display: none;">
+                                <a target="_blank">Click to view your message</a>
+                            </div>
+                        </div>
+                    </div>
+
+                    <t t-if="widget.expiration_reason == 'trial' || (! widget.expiration_reason) || widget.expired || widget.expiring">
+                        <a class="button-quote-link" target="_blank">
+                            <div class="o_mail_channel_preview">
+                                <div class="o_preview_info">
+                                    <div class="o_preview_title">
+                                        <span class="o_preview_name hibou_professional_help">
+                                            See pricing and get a Quote
+                                        </span>
+                                    </div>
+                                    <div>
+                                        <p>Click here to review Hibou's pricing and start a new Professional Subscription.</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </a>
+                        <div class="o_mail_channel_preview subscription_form">
+                            <div class="o_preview_info">
+                                <div class="o_preview_title">
+                                    <p>
+                                        <span t-if="widget.expiration_reason == 'trial'">You are on a trial of Hibou Professional.<br/></span>
+                                        If you have a subscription code, please enter it here.
+                                    </p>
+                                </div>
+                                <div>
+                                    <input type="text" name="hibou_professional_code form-control" class="hibou_professional_code"/>
+                                    <button type="submit" class="update_subscription btn btn-primary">Update Subscription</button>
+                                </div>
+                            </div>
+                        </div>
+                    </t>
+                    <div t-if="widget.is_admin" class="o_mail_channel_preview message_preferences_form">
+                        <div class="o_preview_info">
+                            <div class="o_preview_title">
+                                <p>
+                                    You can send messages (tickets, project tasks, etc.) directly to Hibou using this dropdown.<br/><br/>Select which users can send messages.
+                                </p>
+                            </div>
+                            <div>
+                                <p>
+                                    <input type="checkbox" t-att-checked="widget.allow_admin_message=='1' or None" name="hibou_allow_admin_message" class="hibou_allow_admin_message"/> Admin Users (like yourself)
+                                </p>
+                                <p>
+                                    <input type="checkbox" t-att-checked="widget.allow_message=='1' or None" name="hibou_allow_message" class="hibou_allow_message"/> All Internal Users
+                                </p>
+                                <button type="submit" class="update_message_preferences btn btn-secondary">Update Message Preferences</button>
+                            </div>
+                        </div>
+                    </div>
+                </li>
+            </ul>
+        </li>
+    </t>
+</templates>
\ No newline at end of file
diff --git a/hibou_professional/views/webclient_templates.xml b/hibou_professional/views/webclient_templates.xml
new file mode 100644
index 00000000..aecb5ae6
--- /dev/null
+++ b/hibou_professional/views/webclient_templates.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="assets_backend" name="Hibou Professional" inherit_id="web.assets_backend" priority='15'>
+        <xpath expr="//script[last()]" position="after">
+            <script type="text/javascript" src="/hibou_professional/static/src/js/core.js"></script>
+        </xpath>
+        <xpath expr="//link[last()]" position="after">
+            <link rel="stylesheet" type="text/css" href="/hibou_professional/static/src/css/web.css"/>
+        </xpath>
+    </template>
+</odoo>
\ No newline at end of file

From 8deb11c22bbcdd9f7d6e229183b0dbfa79e223d0 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Tue, 29 Sep 2020 12:08:40 -0700
Subject: [PATCH 12/13] [FIX] menu dissapears on click in certain elements.
 production endpiont.

---
 hibou_professional/models/update.py      | 10 ++++------
 hibou_professional/static/src/js/core.js | 21 +++++----------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/hibou_professional/models/update.py b/hibou_professional/models/update.py
index a52e2717..ab1eb720 100644
--- a/hibou_professional/models/update.py
+++ b/hibou_professional/models/update.py
@@ -9,12 +9,10 @@ from odoo.exceptions import UserError
 
 class PublisherWarrantyContract(models.AbstractModel):
     _inherit = 'publisher_warranty.contract'
-    # CONFIG_HIBOU_URL = 'https://hibou.io/hibouapi/v1/professional'
-    CONFIG_HIBOU_URL = 'https://odoo-hibou-test12.hibou-test-odoo.us-w-p1.hibou.me/hibouapi/v1/professional'
-    # CONFIG_HIBOU_MESSAGE_URL = 'https://hibou.io/hibouapi/v1/professional/message'
-    CONFIG_HIBOU_MESSAGE_URL = 'https://odoo-hibou-test12.hibou-test-odoo.us-w-p1.hibou.me/hibouapi/v1/professional/message'
-    # CONFIG_HIBOU_QUOTE_URL = 'https://hibou.io/hibouapi/v1/professional/quote'
-    CONFIG_HIBOU_QUOTE_URL = 'https://odoo-hibou-test12.hibou-test-odoo.us-w-p1.hibou.me/hibouapi/v1/professional/quote'
+
+    CONFIG_HIBOU_URL = 'https://api.hibou.io/hibouapi/v1/professional'
+    CONFIG_HIBOU_MESSAGE_URL = 'https://api.hibou.io/hibouapi/v1/professional/message'
+    CONFIG_HIBOU_QUOTE_URL = 'https://api.hibou.io/hibouapi/v1/professional/quote'
     DAYS_ENDING_SOON = 7
 
     @api.model
diff --git a/hibou_professional/static/src/js/core.js b/hibou_professional/static/src/js/core.js
index 2545025a..8308a977 100644
--- a/hibou_professional/static/src/js/core.js
+++ b/hibou_professional/static/src/js/core.js
@@ -203,16 +203,17 @@ var HibouProfessionalSystrayWidget = Widget.extend({
             self.update_subject_selection(el);
         });
 
+        // propagation will dismiss the modal/dropdown
+        this.$el.find('.o_mail_navbar_dropdown').on('click', function(e){
+            e.stopPropagation();
+        });
+
         // Update Subscription Button
         this.$('.update_subscription').on('click', function(e){
-            e.preventDefault();
-            e.stopPropagation();
             self.button_update_subscription();
         });
 
         this.$('.hibou_get_messages').on('click', function(e){
-            e.preventDefault();
-            e.stopPropagation();
             self.button_get_messages();
         });
 
@@ -221,30 +222,18 @@ var HibouProfessionalSystrayWidget = Widget.extend({
             if (self.quote_url) {
                 return;  // allow default url click event
             }
-            e.preventDefault();
-            e.stopPropagation();
             self.button_quote();
         });
 
         // Update Message Preferences Button
         this.$('.update_message_preferences').on('click', function(e){
-            e.preventDefault();
-            e.stopPropagation();
             self.button_update_message_preferences();
         });
 
         // Send Message Button
         this.$('.hibou_send_message').on('click', function(e){
-            e.preventDefault();
-            e.stopPropagation();
             self.button_send_message();
         });
-
-        // Kill the default click event
-        this.$('.hibou_message_form_container').on('click', function (e) {
-            //e.preventDefault();
-            e.stopPropagation();
-        })
     },
 
     handleStatusUpdate: function(status) {

From 2f0e3700a1873b2ad5b1e74bb26b1dd5f02c3253 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Fri, 20 Nov 2020 11:35:51 -0800
Subject: [PATCH 13/13] [IMP] hibou_professional: correct icon and help link.

---
 hibou_professional/static/src/xml/templates.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hibou_professional/static/src/xml/templates.xml b/hibou_professional/static/src/xml/templates.xml
index 41b45328..3c412abc 100644
--- a/hibou_professional/static/src/xml/templates.xml
+++ b/hibou_professional/static/src/xml/templates.xml
@@ -3,15 +3,14 @@
     <t t-name="HibouProfessionalSystrayWidget">
         <li class="hibou_professional_systray o_mail_systray_item">
             <a class="dropdown-toggle o-no-caret" data-toggle="dropdown" aria-expanded="false" data-flip="false" data-display="static" href="#">
-                <img t-if="! (widget.expiring || widget.expired)" class="hibou-icon-small" width="16px" height="16px" src="hibou_professional/static/src/img/hibou_icon_small.png" alt="Hibou Icon"/>
+                <img t-if="! (widget.expiring || widget.expired)" class="hibou-icon-small" width="16px" height="16px" src="/hibou_professional/static/src/img/hibou_icon_small.png" alt="Hibou Icon"/>
                 <i class="fa fa-exclamation-triangle" t-if="widget.expiring || widget.expired"/>
                 <span class="expiration_message" t-if="widget.expiring" t-esc="widget.expiring"/>
                 <span class="expiration_message" t-if="widget.expired" t-esc="widget.expired"/>
             </a>
             <ul class="dropdown-menu o_mail_navbar_dropdown" role="menu">
                 <li class="o_mail_navbar_dropdown_channels">
-                    <a href="https://odoo-hibou-test12.hibou-test-odoo.us-w-p1.hibou.me/help?utm_source=db&amp;utm_medium=help" target="_blank">
-<!--                    <a href="https://hibou.io/help?utm_source=db&amp;utm_medium=help" target="_blank">-->
+                    <a href="https://hibou.io/help?utm_source=db&amp;utm_medium=help" target="_blank">
                         <div class="o_mail_channel_preview">
                             <div class="o_preview_info">
                                 <div class="o_preview_title">