From c1d5d952ce78009147dd24391005f2363969b4da Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Mon, 15 Jul 2019 08:17:42 -0700
Subject: [PATCH 01/10] 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 a5fd3693c66d7d2358deceb8515703dd585cdc5d Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Mon, 15 Jul 2019 09:47:51 -0700
Subject: [PATCH 02/10] 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 14d7d5ebf2e713eff7c7f147c06fa369129cf0ef Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Mon, 15 Jul 2019 12:29:38 -0700
Subject: [PATCH 03/10] 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 08647b95e680593cdb9c4bf183e5eb6d017d6e4e Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Tue, 16 Jul 2019 15:07:41 -0700
Subject: [PATCH 04/10] 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 899f9ccd653f8051ca78047e71e0921a9f4b4c59 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Tue, 16 Jul 2019 15:57:05 -0700
Subject: [PATCH 05/10] 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 083502e427cb4eb1c4f11e90b647d1aa76da8d56 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Wed, 17 Jul 2019 13:27:39 -0700
Subject: [PATCH 06/10] 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 a59442bdd981cdb652930503de200ea5e8c6e096 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Wed, 17 Jul 2019 15:15:09 -0700
Subject: [PATCH 07/10] 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 ae40e90f93f80205de849f227198609064f31886 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Fri, 19 Jul 2019 13:12:44 -0700
Subject: [PATCH 08/10] 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 944f759ccd5d102c03ec7a9e69a80b190dd69a66 Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Thu, 25 Jul 2019 15:20:09 -0700
Subject: [PATCH 09/10] 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 cbba381c356fbd2c8c18123e029d0c53b6234fbb Mon Sep 17 00:00:00 2001
From: Jared Kipe <jared@hibou.io>
Date: Sat, 27 Jul 2019 07:34:41 -0700
Subject: [PATCH 10/10] FIX `sale_planner` Converting arrival date to transit
 days makes transit days too high.

---
 sale_planner/models/delivery.py      | 2 +-
 sale_planner/wizard/order_planner.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sale_planner/models/delivery.py b/sale_planner/models/delivery.py
index 17a5eb25..fcf09acc 100644
--- a/sale_planner/models/delivery.py
+++ b/sale_planner/models/delivery.py
@@ -72,9 +72,9 @@ class DeliveryCarrier(models.Model):
                 return self._calculate_transit_days_naive(date_planned, date_delivered)
             if current_date_planned == date_planned:
                 date_planned += timedelta(days=1)
+                transit_days += 1
             else:
                 date_planned = current_date_planned
-            transit_days += 1
 
         if transit_days > 1:
             transit_days -= 1
diff --git a/sale_planner/wizard/order_planner.py b/sale_planner/wizard/order_planner.py
index c3308c66..8b8ac472 100644
--- a/sale_planner/wizard/order_planner.py
+++ b/sale_planner/wizard/order_planner.py
@@ -625,6 +625,8 @@ class SaleOrderMakePlan(models.TransientModel):
         if warehouse.shipping_calendar_id:
             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 not then:
+                return False
             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)