diff --git a/sale_planner/__init__.py b/sale_planner/__init__.py
new file mode 100644
index 00000000..b0eafef5
--- /dev/null
+++ b/sale_planner/__init__.py
@@ -0,0 +1,4 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import wizard
+from . import models
diff --git a/sale_planner/__manifest__.py b/sale_planner/__manifest__.py
new file mode 100644
index 00000000..ebd0c7ed
--- /dev/null
+++ b/sale_planner/__manifest__.py
@@ -0,0 +1,44 @@
+{
+ 'name': 'Sale Order Planner',
+ 'summary': 'Plans order dates and warehouses.',
+ 'version': '16.0.2.0.0',
+ 'author': "Hibou Corp.",
+ 'category': 'Sale',
+ 'license': 'OPL-1',
+ 'complexity': 'expert',
+ 'images': [],
+ 'website': "https://hibou.io",
+ 'description': """
+Sale Order Planner
+==================
+
+Plans sales order dates based on available warehouses and shipping methods.
+
+Adds shipping calendar to warehouse to plan delivery orders based on availability
+of the warehouse or warehouse staff.
+
+Adds shipping calendar to individual shipping methods to estimate delivery based
+on the specific method's characteristics. (e.g. Do they deliver on Saturday?)
+
+
+""",
+ 'depends': [
+ 'sale_sourced_by_line',
+ 'base_geolocalize',
+ 'delivery',
+ 'resource',
+ 'stock',
+ ],
+ 'demo': [],
+ 'data': [
+ 'security/ir.model.access.csv',
+ 'wizard/order_planner_views.xml',
+ 'views/sale.xml',
+ 'views/stock.xml',
+ 'views/delivery.xml',
+ 'views/product.xml',
+ 'views/res_config_settings_views.xml',
+ ],
+ 'auto_install': False,
+ 'installable': True,
+}
diff --git a/sale_planner/i18n/es.po b/sale_planner/i18n/es.po
new file mode 100644
index 00000000..3b9ab83a
--- /dev/null
+++ b/sale_planner/i18n/es.po
@@ -0,0 +1,237 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * sale_planner
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 15.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-10-12 01:39+0000\n"
+"PO-Revision-Date: 2021-10-12 01:39+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_policy__always_closest_warehouse
+msgid "Always Plan Closest Warehouse"
+msgstr "Planifique siempre el almacén más cercano"
+
+#. module: sale_planner
+#: model_terms:ir.ui.view,arch_db:sale_planner.view_plan_sale_order
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__carrier_id
+msgid "Carrier"
+msgstr "Transportista"
+
+#. module: sale_planner
+#: model:ir.model,name:sale_planner.model_res_partner
+msgid "Contact"
+msgstr "Contacto"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_make_plan__create_uid
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__create_uid
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_policy__create_uid
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_make_plan__create_date
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__create_date
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_policy__create_date
+msgid "Created on"
+msgstr "Creado el"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_delivery_carrier__delivery_calendar_id
+msgid "Delivery Calendar"
+msgstr "Calendario de Entregas"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_policy__carrier_filter_id
+msgid "Delivery Carrier Filter"
+msgstr "Filtro de Transportista de Entrega"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_make_plan__display_name
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__display_name
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_policy__display_name
+msgid "Display Name"
+msgstr "Nombre para mostrar"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_make_plan__id
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__id
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_policy__id
+msgid "ID"
+msgstr "ID"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_make_plan____last_update
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option____last_update
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_policy____last_update
+msgid "Last Modified on"
+msgstr "Última Modificación el"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_make_plan__write_uid
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__write_uid
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_policy__write_uid
+msgid "Last Updated by"
+msgstr "Última Actualización por"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_make_plan__write_date
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__write_date
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_policy__write_date
+msgid "Last Updated on"
+msgstr "Última Actualización el"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_policy__name
+msgid "Name"
+msgstr "Nombre"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_make_plan__planning_option_ids
+msgid "Options"
+msgstr "Opciones"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_product_category__property_planning_policy_categ_id
+#: model:ir.model.fields,field_description:sale_planner.field_product_product__property_planning_policy_id
+#: model:ir.model.fields,field_description:sale_planner.field_product_template__property_planning_policy_id
+msgid "Order Planner Policy"
+msgstr "Política del planificador de pedidos"
+
+#. module: sale_planner
+#: model:ir.model,name:sale_planner.model_sale_order_planning_option
+msgid "Order Planning Option"
+msgstr "Opciones del planificador de pedidos"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__plan_id
+#: model_terms:ir.ui.view,arch_db:sale_planner.view_order_form_planner
+msgid "Plan"
+msgstr "Planifica"
+
+#. module: sale_planner
+#: model:ir.model,name:sale_planner.model_sale_order_make_plan
+msgid "Plan Order"
+msgstr "Planificar orden"
+
+#. module: sale_planner
+#: model:ir.actions.act_window,name:sale_planner.action_plan_sale_order
+msgid "Plan Sale Order"
+msgstr "Planificar Pedido de Venta"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__date_planned
+msgid "Planned Date"
+msgstr "Fecha Planificada"
+
+#. module: sale_planner
+#: model:ir.model,name:sale_planner.model_product_category
+msgid "Product Category"
+msgstr "Categoría de producto"
+
+#. module: sale_planner
+#: model:ir.model,name:sale_planner.model_product_template
+msgid "Product Template"
+msgstr "Plantilla del producto"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__requested_date
+msgid "Requested Date"
+msgstr "Fecha Solicitada"
+
+#. module: sale_planner
+#: model:ir.model,name:sale_planner.model_resource_calendar
+msgid "Resource Working Time"
+msgstr "Tiempo de trabajo de recursos"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_make_plan__order_id
+msgid "Sale Order"
+msgstr "Pedido de Venta"
+
+#. module: sale_planner
+#: model:ir.model,name:sale_planner.model_sale_order
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_planner
+#: model_terms:ir.ui.view,arch_db:sale_planner.view_plan_sale_order
+msgid "Select"
+msgstr "Seleccionar"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_stock_warehouse__shipping_calendar_id
+msgid "Shipping Calendar"
+msgstr "Calendario de Envíos"
+
+#. module: sale_planner
+#: model:ir.model,name:sale_planner.model_delivery_carrier
+msgid "Shipping Methods"
+msgstr "Métodos de Envío"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__shipping_price
+msgid "Shipping Price"
+msgstr "Precio de Envío"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__sub_options_text
+msgid "Sub Options"
+msgstr "Sub opciones"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__sub_options
+msgid "Sub Options JSON"
+msgstr "Sub opciones JSON"
+
+#. module: sale_planner
+#: model:ir.model.fields,help:sale_planner.field_product_category__property_planning_policy_categ_id
+#: model:ir.model.fields,help:sale_planner.field_product_product__property_planning_policy_id
+#: model:ir.model.fields,help:sale_planner.field_product_template__property_planning_policy_id
+msgid "The Order Planner Policy to use when making a sale order planner."
+msgstr "La Política del planificador de pedidos que se debe utilizar al realizar un planificador de pedidos de venta."
+
+#. module: sale_planner
+#: model:ir.model.fields,help:sale_planner.field_delivery_carrier__delivery_calendar_id
+msgid ""
+"This calendar represents days that the carrier will deliver the package."
+msgstr "Este calendario representa los días en que el transportista entregará el paquete."
+
+#. module: sale_planner
+#: model:ir.model.fields,help:sale_planner.field_stock_warehouse__shipping_calendar_id
+msgid "This calendar represents shipping availability from the warehouse."
+msgstr "Este calendario representa la disponibilidad de envío desde el almacén."
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__transit_days
+msgid "Transit Days"
+msgstr "Días de tránsito"
+
+#. module: sale_planner
+#: model:ir.model,name:sale_planner.model_stock_warehouse
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_option__warehouse_id
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: sale_planner
+#: model:ir.model.fields,field_description:sale_planner.field_sale_order_planning_policy__warehouse_filter_id
+msgid "Warehouse Filter"
+msgstr "Filtro de Almacen"
+
+#. module: sale_planner
+#: model:ir.model,name:sale_planner.model_sale_order_planning_policy
+msgid "sale.order.planning.policy"
+msgstr "sale.order.planning.policy"
diff --git a/sale_planner/models/__init__.py b/sale_planner/models/__init__.py
new file mode 100644
index 00000000..95b4955a
--- /dev/null
+++ b/sale_planner/models/__init__.py
@@ -0,0 +1,10 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import delivery
+from . import partner
+from . import planning
+from . import product
+from . import resource
+from . import sale
+from . import stock
+from . import res_config_settings
diff --git a/sale_planner/models/delivery.py b/sale_planner/models/delivery.py
new file mode 100644
index 00000000..dc66ab81
--- /dev/null
+++ b/sale_planner/models/delivery.py
@@ -0,0 +1,111 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from datetime import timedelta
+
+from odoo import api, fields, models
+
+
+class DeliveryCarrier(models.Model):
+ _inherit = 'delivery.carrier'
+
+ delivery_calendar_id = fields.Many2one(
+ 'resource.calendar', 'Delivery Calendar',
+ help="This calendar represents days that the carrier will deliver the package.")
+
+ # -------------------------- #
+ # API for external providers #
+ # -------------------------- #
+
+ def get_shipping_price_for_plan(self, orders, date_planned):
+ ''' For every sale order, compute the price of the shipment
+
+ :param orders: A recordset of sale orders
+ :param date_planned: Date to say that the shipment is leaving.
+ :return list: A list of floats, containing the estimated price for the shipping of the sale order
+ '''
+ self.ensure_one()
+ if hasattr(self, '%s_get_shipping_price_for_plan' % self.delivery_type):
+ return getattr(self, '%s_get_shipping_price_for_plan' % self.delivery_type)(orders, date_planned)
+
+ def rate_shipment_date_planned(self, order, date_planned=None):
+ """
+ For every sale order, compute the price of the shipment and potentially when it will arrive.
+ :param order: `sale.order`
+ :param date_planned: The date the shipment is expected to leave/be picked up by carrier.
+ :return: rate in the same form the normal `rate_shipment` method does BUT
+ -- Additional keys
+ - transit_days: int
+ - date_delivered: string
+ """
+ self.ensure_one()
+ if hasattr(self, '%s_rate_shipment_date_planned' % self.delivery_type):
+ # New API Odoo 11 - Carrier specific override.
+ return getattr(self, '%s_rate_shipment_date_planned' % self.delivery_type)(order, date_planned)
+
+ rate = self.with_context(date_planned=date_planned).rate_shipment(order)
+ if rate and date_planned:
+ if rate.get('date_delivered'):
+ date_delivered = rate['date_delivered']
+ transit_days = self.calculate_transit_days(date_planned, date_delivered)
+ if not rate.get('transit_days') or transit_days < rate.get('transit_days'):
+ rate['transit_days'] = transit_days
+ elif rate.get('transit_days'):
+ rate['date_delivered'] = self.calculate_date_delivered(date_planned, rate.get('transit_days'))
+ elif rate:
+ date_delivered = rate.get('date_delivered')
+ if date_delivered and not rate.get('transit_days'):
+ # we could have a date delivered based on shipping it "now"
+ # so we can still calculate the transit days
+ rate['transit_days'] = self.calculate_transit_days(fields.Datetime.now(), date_delivered)
+ rate.pop('date_delivered') # because we don't have a date_planned, we cannot have a guarenteed delivery
+
+ return rate
+
+ def calculate_transit_days(self, date_planned, date_delivered):
+ self.ensure_one()
+ if not self.delivery_calendar_id:
+ return 0
+
+ if isinstance(date_planned, str):
+ date_planned = fields.Datetime.from_string(date_planned)
+ if isinstance(date_delivered, str):
+ date_delivered = fields.Datetime.from_string(date_delivered)
+
+ transit_days = 0
+ while date_planned < date_delivered:
+ if transit_days > 10:
+ break
+
+ current_date_planned = self.delivery_calendar_id.plan_days(1, date_planned, compute_leaves=True)
+ if not current_date_planned:
+ return self._calculate_transit_days_naive(date_planned, date_delivered)
+ if current_date_planned == date_planned:
+ date_planned += timedelta(days=1)
+ else:
+ date_planned = current_date_planned
+ transit_days += 1
+
+ if transit_days > 1:
+ transit_days -= 1
+
+ return transit_days
+
+ def _calculate_transit_days_naive(self, date_planned, date_delivered):
+ return abs((date_delivered - date_planned).days)
+
+ def calculate_date_delivered(self, date_planned, transit_days):
+ self.ensure_one()
+ if isinstance(date_planned, str):
+ date_planned = fields.Datetime.from_string(date_planned)
+
+ # date calculations needs an extra day
+ effective_transit_days = transit_days + 1
+
+ last_day = self.delivery_calendar_id.plan_days_end(effective_transit_days, date_planned, compute_leaves=True)
+ if not last_day:
+ return self._calculate_date_delivered_naive(date_planned, transit_days)
+
+ return last_day
+
+ def _calculate_date_delivered_naive(self, date_planned, transit_days):
+ return date_planned + timedelta(days=transit_days)
diff --git a/sale_planner/models/partner.py b/sale_planner/models/partner.py
new file mode 100644
index 00000000..a5c8a39e
--- /dev/null
+++ b/sale_planner/models/partner.py
@@ -0,0 +1,33 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+try:
+ from uszipcode import SearchEngine
+except ImportError:
+ SearchEngine = None
+
+
+class Partner(models.Model):
+ _inherit = 'res.partner'
+
+ def geo_localize(self):
+ # We need country names in English below
+ for partner in self.with_context(lang='en_US'):
+ try:
+ if SearchEngine and partner.zip:
+ with SearchEngine() as search:
+ zipcode = search.by_zipcode(str(self.zip).split('-')[0])
+ if zipcode and zipcode.lat:
+ partner.write({
+ 'partner_latitude': zipcode.lat,
+ 'partner_longitude': zipcode.lng,
+ 'date_localization': fields.Date.context_today(partner),
+ })
+ else:
+ super(Partner, partner).geo_localize()
+ else:
+ super(Partner, partner).geo_localize()
+ except:
+ pass
+ return True
diff --git a/sale_planner/models/planning.py b/sale_planner/models/planning.py
new file mode 100644
index 00000000..54969669
--- /dev/null
+++ b/sale_planner/models/planning.py
@@ -0,0 +1,18 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class PlanningPolicy(models.Model):
+ _name = 'sale.order.planning.policy'
+
+ name = fields.Char(string='Name')
+ carrier_filter_id = fields.Many2one(
+ 'ir.filters',
+ string='Delivery Carrier Filter',
+ )
+ warehouse_filter_id = fields.Many2one(
+ 'ir.filters',
+ string='Warehouse Filter',
+ )
+ always_closest_warehouse = fields.Boolean(string='Always Plan Closest Warehouse')
diff --git a/sale_planner/models/product.py b/sale_planner/models/product.py
new file mode 100644
index 00000000..add93077
--- /dev/null
+++ b/sale_planner/models/product.py
@@ -0,0 +1,23 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class ProductTemplate(models.Model):
+ _inherit = 'product.template'
+
+ property_planning_policy_id = fields.Many2one('sale.order.planning.policy', company_dependent=True,
+ string="Order Planner Policy",
+ help="The Order Planner Policy to use when making a sale order planner.")
+
+ def get_planning_policy(self):
+ self.ensure_one()
+ return self.property_planning_policy_id or self.categ_id.property_planning_policy_categ_id
+
+
+class ProductCategory(models.Model):
+ _inherit = 'product.category'
+
+ property_planning_policy_categ_id = fields.Many2one('sale.order.planning.policy', company_dependent=True,
+ string="Order Planner Policy",
+ help="The Order Planner Policy to use when making a sale order planner.")
diff --git a/sale_planner/models/res_config_settings.py b/sale_planner/models/res_config_settings.py
new file mode 100644
index 00000000..06e2f899
--- /dev/null
+++ b/sale_planner/models/res_config_settings.py
@@ -0,0 +1,79 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+def sale_planner_warehouse_ids(env, company):
+ get_param = env['ir.config_parameter'].sudo().get_param
+ warehouse_ids = get_param('sale.planner.warehouse_ids.%s' % (company.id, )) or []
+ if warehouse_ids and isinstance(warehouse_ids, str):
+ try:
+ warehouse_ids = [int(i) for i in warehouse_ids.split(',')]
+ except:
+ warehouse_ids = []
+ return warehouse_ids
+
+
+def sale_planner_carrier_ids(env, company):
+ get_param = env['ir.config_parameter'].sudo().get_param
+ carrier_ids = get_param('sale.planner.carrier_ids.%s' % (company.id, )) or []
+ if carrier_ids and isinstance(carrier_ids, str):
+ try:
+ carrier_ids = [int(c) for c in carrier_ids.split(',')]
+ except:
+ carrier_ids = []
+ return carrier_ids
+
+
+class ResConfigSettings(models.TransientModel):
+ _inherit = 'res.config.settings'
+
+ sale_planner_warehouse_ids = fields.Many2many('stock.warehouse',
+ string='Sale Order Planner Warehouses',
+ compute='_compute_sale_planner_warehouse_ids',
+ inverse='_inverse_sale_planner_warehouse_ids')
+ sale_planner_carrier_ids = fields.Many2many('delivery.carrier',
+ string='Sale Order Planner Carriers',
+ compute='_compute_sale_planner_carrier_ids',
+ inverse='_inverse_sale_planner_carrier_ids')
+
+ def _compute_sale_planner_warehouse_ids_ids(self):
+ company = self.company_id or self.env.user.company_id
+ return sale_planner_warehouse_ids(self.env, company)
+
+ def _compute_sale_planner_carrier_ids_ids(self):
+ company = self.company_id or self.env.user.company_id
+ return sale_planner_carrier_ids(self.env, company)
+
+ def _compute_sale_planner_warehouse_ids(self):
+ for settings in self:
+ warehouse_ids = settings._compute_sale_planner_warehouse_ids_ids()
+ warehouses = self.env['stock.warehouse'].browse(warehouse_ids)
+ settings.sale_planner_warehouse_ids = warehouses
+
+ def _compute_sale_planner_carrier_ids(self):
+ for settings in self:
+ carrier_ids = settings._compute_sale_planner_carrier_ids_ids()
+ carriers = self.env['delivery.carrier'].browse(carrier_ids)
+ settings.sale_planner_carrier_ids = carriers
+
+ def _inverse_sale_planner_warehouse_ids(self):
+ set_param = self.env['ir.config_parameter'].sudo().set_param
+ company_id = self.company_id.id or self.env.user.company_id.id
+ for settings in self:
+ warehouse_ids = ','.join(str(i) for i in settings.sale_planner_warehouse_ids.ids)
+ set_param('sale.planner.warehouse_ids.%s' % (company_id, ), warehouse_ids)
+
+ def _inverse_sale_planner_carrier_ids(self):
+ set_param = self.env['ir.config_parameter'].sudo().set_param
+ company_id = self.company_id.id or self.env.user.company_id.id
+ for settings in self:
+ carrier_ids = ','.join(str(i) for i in settings.sale_planner_carrier_ids.ids)
+ set_param('sale.planner.carrier_ids.%s' % (company_id, ), carrier_ids)
+
+ @api.model
+ def get_values(self):
+ res = super(ResConfigSettings, self).get_values()
+ res['sale_planner_warehouse_ids'] = [(6, 0, self._compute_sale_planner_warehouse_ids_ids())]
+ res['sale_planner_carrier_ids'] = [(6, 0, self._compute_sale_planner_carrier_ids_ids())]
+ return res
diff --git a/sale_planner/models/resource.py b/sale_planner/models/resource.py
new file mode 100644
index 00000000..de7895aa
--- /dev/null
+++ b/sale_planner/models/resource.py
@@ -0,0 +1,46 @@
+from functools import partial
+from datetime import timedelta
+from odoo import api, models
+from odoo.addons.resource.models.resource import make_aware
+
+
+class ResourceCalendar(models.Model):
+ _inherit = 'resource.calendar'
+
+ def plan_days_end(self, days, day_dt, compute_leaves=False, domain=None):
+ """
+ Override to `plan_days` that allows you to get the nearest 'end' including today.
+ """
+ day_dt, revert = make_aware(day_dt)
+
+ # which method to use for retrieving intervals
+ if compute_leaves:
+ get_intervals = partial(self._work_intervals_batch, domain=domain)
+ else:
+ get_intervals = self._attendance_intervals_batch
+
+ if days >= 0:
+ found = set()
+ delta = timedelta(days=14)
+ for n in range(100):
+ dt = day_dt + delta * n
+ for start, stop, meta in get_intervals(dt, dt + delta)[False]:
+ found.add(start.date())
+ if len(found) >= days:
+ return revert(stop)
+ return False
+
+ elif days < 0:
+ days = abs(days)
+ found = set()
+ delta = timedelta(days=14)
+ for n in range(100):
+ dt = day_dt - delta * n
+ for start, stop, meta in reversed(get_intervals(dt - delta, dt))[False]:
+ found.add(start.date())
+ if len(found) == days:
+ return revert(start)
+ return False
+
+ else:
+ return revert(day_dt)
diff --git a/sale_planner/models/sale.py b/sale_planner/models/sale.py
new file mode 100644
index 00000000..919de060
--- /dev/null
+++ b/sale_planner/models/sale.py
@@ -0,0 +1,17 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class SaleOrder(models.Model):
+ _inherit = 'sale.order'
+
+ def action_planorder(self):
+ plan_obj = self.env['sale.order.make.plan']
+ for order in self:
+ plan = plan_obj.create({
+ 'order_id': order.id,
+ })
+ action = self.env.ref('sale_planner.action_plan_sale_order').read()[0]
+ action['res_id'] = plan.id
+ return action
diff --git a/sale_planner/models/stock.py b/sale_planner/models/stock.py
new file mode 100644
index 00000000..10011e6c
--- /dev/null
+++ b/sale_planner/models/stock.py
@@ -0,0 +1,15 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo import api, fields, models
+
+
+class Warehouse(models.Model):
+ _inherit = 'stock.warehouse'
+
+ shipping_calendar_id = fields.Many2one(
+ 'resource.calendar', 'Shipping Calendar',
+ help="This calendar represents shipping availability from the warehouse.")
+ sale_planner_carrier_ids = fields.Many2many('delivery.carrier',
+ relation='sale_planner_carrier_wh_rel',
+ string='Sale Order Planner Base Carriers',
+ help='Overrides the global carriers.')
diff --git a/sale_planner/security/ir.model.access.csv b/sale_planner/security/ir.model.access.csv
new file mode 100644
index 00000000..57dffffb
--- /dev/null
+++ b/sale_planner/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_sale_order_make_plan,access_sale_order_make_plan,model_sale_order_make_plan,base.group_user,1,1,1,1
+access_sale_order_planning_option,access_sale_order_planning_option,model_sale_order_planning_option,base.group_user,1,1,1,1
+access_sale_order_planning_policy,access_sale_order_planning_policy,model_sale_order_planning_policy,base.group_user,1,1,1,1
\ No newline at end of file
diff --git a/sale_planner/tests/__init__.py b/sale_planner/tests/__init__.py
new file mode 100644
index 00000000..8208aa7b
--- /dev/null
+++ b/sale_planner/tests/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import test_planner
diff --git a/sale_planner/tests/test_planner.py b/sale_planner/tests/test_planner.py
new file mode 100644
index 00000000..3acc20d5
--- /dev/null
+++ b/sale_planner/tests/test_planner.py
@@ -0,0 +1,481 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from odoo.tests import common
+from datetime import datetime, timedelta
+from json import loads as json_decode
+from logging import getLogger
+
+_logger = getLogger(__name__)
+
+
+class TestPlanner(common.TransactionCase):
+ # @todo Test date planning!
+
+ def setUp(self):
+ super(TestPlanner, self).setUp()
+ self.today = datetime.today()
+ self.tomorrow = datetime.today() + timedelta(days=1)
+ # This partner has a parent
+ self.country_usa = self.env['res.country'].search([('name', '=', 'United States')], limit=1)
+ self.state_wa = self.env['res.country.state'].search([('name', '=', 'Washington')], limit=1)
+ self.state_co = self.env['res.country.state'].search([('name', '=', 'Colorado')], limit=1)
+ self.partner_wa = self.env['res.partner'].create({
+ 'name': 'Jared',
+ 'street': '1234 Test Street',
+ 'city': 'Marysville',
+ 'state_id': self.state_wa.id,
+ 'zip': '98270',
+ 'country_id': self.country_usa.id,
+ 'partner_latitude': 48.05636,
+ 'partner_longitude': -122.14922,
+ })
+ self.warehouse_partner_1 = self.env['res.partner'].create({
+ 'name': 'WH1',
+ 'street': '1234 Test Street',
+ 'city': 'Lynnwood',
+ 'state_id': self.state_wa.id,
+ 'zip': '98036',
+ 'country_id': self.country_usa.id,
+ 'partner_latitude': 47.82093,
+ 'partner_longitude': -122.31513,
+ })
+
+ self.warehouse_partner_2 = self.env['res.partner'].create({
+ 'name': 'WH2',
+ 'street': '1234 Test Street',
+ 'city': 'Craig',
+ 'state_id': self.state_co.id,
+ 'zip': '81625',
+ 'country_id': self.country_usa.id,
+ 'partner_latitude': 40.51525,
+ 'partner_longitude': -107.54645,
+ })
+ hour_from = (self.today.hour - 1) % 24
+ hour_to = (self.today.hour + 1) % 24
+ if hour_to < hour_from:
+ hour_to, hour_from = hour_from, hour_to
+
+ self.warehouse_calendar_1 = self.env['resource.calendar'].create({
+ 'name': 'Washington Warehouse Hours',
+ 'tz': 'UTC',
+ 'attendance_ids': [
+ (0, 0, {'name': 'today',
+ 'dayofweek': str(self.today.weekday()),
+ 'hour_from': hour_from,
+ 'hour_to': hour_to,
+ 'day_period': 'morning'}),
+
+ (0, 0, {'name': 'tomorrow',
+ 'dayofweek': str(self.tomorrow.weekday()),
+ 'hour_from': hour_from,
+ 'hour_to': hour_to,
+ 'day_period': 'morning'}),
+
+ ]
+ })
+ self.warehouse_calendar_2 = self.env['resource.calendar'].create({
+ 'name': 'Colorado Warehouse Hours',
+ 'tz': 'UTC',
+ 'attendance_ids': [
+ (0, 0, {'name': 'tomorrow',
+ 'dayofweek': str(self.tomorrow.weekday()),
+ 'hour_from': hour_from,
+ 'hour_to': hour_to,
+ 'day_period': 'morning'}),
+ ]
+ })
+ self.warehouse_1 = self.env['stock.warehouse'].create({
+ 'name': 'Washington Warehouse',
+ 'partner_id': self.warehouse_partner_1.id,
+ 'code': 'TWH1',
+ 'shipping_calendar_id': self.warehouse_calendar_1.id,
+ })
+ self.warehouse_2 = self.env['stock.warehouse'].create({
+ 'name': 'Colorado Warehouse',
+ 'partner_id': self.warehouse_partner_2.id,
+ 'code': 'TWH2',
+ 'shipping_calendar_id': self.warehouse_calendar_2.id,
+ })
+ self.so = self.env['sale.order'].create({
+ 'partner_id': self.partner_wa.id,
+ 'warehouse_id': self.warehouse_1.id,
+ })
+ self.product_1 = self.env['product.template'].create({
+ 'name': 'Product for WH1',
+ 'type': 'product',
+ 'standard_price': 1.0,
+ })
+ self.product_12 = self.env['product.template'].create({
+ 'name': 'Product for WH1 Second',
+ 'type': 'product',
+ 'standard_price': 1.0,
+ })
+ self.product_1 = self.product_1.product_variant_id
+ self.product_12 = self.product_12.product_variant_id
+ self.product_2 = self.env['product.template'].create({
+ 'name': 'Product for WH2',
+ 'type': 'product',
+ 'standard_price': 1.0,
+ })
+ self.product_22 = self.env['product.template'].create({
+ 'name': 'Product for WH2 Second',
+ 'type': 'product',
+ 'standard_price': 1.0,
+ })
+ self.product_2 = self.product_2.product_variant_id
+ self.product_22 = self.product_22.product_variant_id
+ self.product_both = self.env['product.template'].create({
+ 'name': 'Product for Both',
+ 'type': 'product',
+ 'standard_price': 1.0,
+ })
+ self.product_both = self.product_both.product_variant_id
+ self.env['stock.quant'].create({
+ 'location_id': self.warehouse_1.lot_stock_id.id,
+ 'product_id': self.product_1.id,
+ 'quantity': 100,
+ })
+ self.env['stock.quant'].create({
+ 'location_id': self.warehouse_1.lot_stock_id.id,
+ 'product_id': self.product_12.id,
+ 'quantity': 100,
+ })
+ self.env['stock.quant'].create({
+ 'location_id': self.warehouse_1.lot_stock_id.id,
+ 'product_id': self.product_both.id,
+ 'quantity': 100,
+ })
+ self.env['stock.quant'].create({
+ 'location_id': self.warehouse_2.lot_stock_id.id,
+ 'product_id': self.product_2.id,
+ 'quantity': 100,
+ })
+ self.env['stock.quant'].create({
+ 'location_id': self.warehouse_2.lot_stock_id.id,
+ 'product_id': self.product_22.id,
+ 'quantity': 100,
+ })
+ self.env['stock.quant'].create({
+ 'location_id': self.warehouse_2.lot_stock_id.id,
+ 'product_id': self.product_both.id,
+ 'quantity': 100,
+ })
+
+ self.policy_closest = self.env['sale.order.planning.policy'].create({
+ 'always_closest_warehouse': True,
+ })
+ self.policy_other = self.env['sale.order.planning.policy'].create({})
+ self.wh_filter_1 = self.env['ir.filters'].create({
+ 'name': 'TWH1 Only',
+ 'domain': "[('id', '=', %d)]" % (self.warehouse_1.id, ),
+ 'model_id': 'stock.warehouse',
+ })
+ self.wh_filter_2 = self.env['ir.filters'].create({
+ 'name': 'TWH2 Only',
+ 'domain': "[('id', '=', %d)]" % (self.warehouse_2.id,),
+ 'model_id': 'stock.warehouse',
+ })
+ self.policy_wh_1 = self.env['sale.order.planning.policy'].create({
+ 'warehouse_filter_id': self.wh_filter_1.id,
+ })
+ self.policy_wh_2 = self.env['sale.order.planning.policy'].create({
+ 'warehouse_filter_id': self.wh_filter_2.id,
+ })
+
+ def both_wh_ids(self):
+ return [self.warehouse_1.id, self.warehouse_2.id]
+
+ def test_10_planner_creation_internals(self):
+ """
+ Tests certain internal representations and that we can create a basic plan.
+ """
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_1.id,
+ 'name': 'demo',
+ })
+ both_wh_ids = self.both_wh_ids()
+ planner = self.env['sale.order.make.plan'].with_context(warehouse_domain=[('id', 'in', both_wh_ids)], skip_plan_shipping=True).create({'order_id': self.so.id})
+ self.assertEqual(set(both_wh_ids), set(planner.get_warehouses().ids))
+ fake_order = planner._fake_order(self.so)
+ base_option = planner.generate_base_option(fake_order)
+ self.assertTrue(base_option, 'Must have base option.')
+ self.assertEqual(self.warehouse_1.id, base_option['warehouse_id'])
+
+ def test_21_planner_creation(self):
+ """
+ Scenario where only one warehouse has inventory on the order line.
+ This is "the closest" warehouse.
+ """
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_1.id,
+ 'name': 'demo',
+ })
+ self.assertEqual(self.product_1.with_context(warehouse=self.warehouse_2.id).qty_available, 0)
+ self.product_1.invalidate_cache(fnames=['qty_available'], ids=self.product_1.ids)
+ self.assertEqual(self.product_1.with_context(warehouse=self.warehouse_1.id).qty_available, 100)
+ self.product_1.invalidate_cache(fnames=['qty_available'], ids=self.product_1.ids)
+
+ both_wh_ids = self.both_wh_ids()
+ planner = self.env['sale.order.make.plan'].with_context(warehouse_domain=[('id', 'in', both_wh_ids)], skip_plan_shipping=True).create({'order_id': self.so.id})
+ self.assertTrue(planner.planning_option_ids, 'Must have one or more plans.')
+ self.assertEqual(planner.planning_option_ids.warehouse_id, self.warehouse_1)
+ self.assertFalse(planner.planning_option_ids[0].sub_options)
+
+ def test_22_planner_creation(self):
+ """
+ Scenario where only one warehouse has inventory on the order line.
+ This is "the further" warehouse.
+ """
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_2.id,
+ 'name': 'demo',
+ })
+ self.assertEqual(self.product_2.with_context(warehouse=self.warehouse_1.id).qty_available, 0)
+ self.product_2.invalidate_cache(fnames=['qty_available'], ids=self.product_2.ids)
+ self.assertEqual(self.product_2.with_context(warehouse=self.warehouse_2.id).qty_available, 100)
+ self.product_2.invalidate_cache(fnames=['qty_available'], ids=self.product_2.ids)
+ both_wh_ids = self.both_wh_ids()
+ planner = self.env['sale.order.make.plan'].with_context(warehouse_domain=[('id', 'in', both_wh_ids)], skip_plan_shipping=True).create({'order_id': self.so.id})
+ self.assertTrue(planner.planning_option_ids, 'Must have one or more plans.')
+ self.assertEqual(planner.planning_option_ids.warehouse_id, self.warehouse_2)
+ self.assertFalse(planner.planning_option_ids[0].sub_options)
+
+ def test_31_planner_creation_split(self):
+ """
+ Scenario where only one warehouse has inventory on each of the order line.
+ This will cause two pickings to be created, one for each warehouse.
+ """
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_1.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_2.id,
+ 'name': 'demo2',
+ })
+ self.assertEqual(self.product_1.with_context(warehouse=self.warehouse_1.id).qty_available, 100)
+ self.assertEqual(self.product_2.with_context(warehouse=self.warehouse_2.id).qty_available, 100)
+ both_wh_ids = self.both_wh_ids()
+ planner = self.env['sale.order.make.plan'].with_context(warehouse_domain=[('id', 'in', both_wh_ids)], skip_plan_shipping=True).create({'order_id': self.so.id})
+ self.assertTrue(planner.planning_option_ids, 'Must have one or more plans.')
+ self.assertTrue(planner.planning_option_ids[0].sub_options)
+
+ def test_32_planner_creation_no_split(self):
+ """
+ Scenario where only "the further" warehouse has inventory on whole order, but
+ the "closest" warehouse only has inventory on one item.
+ This will simply plan out of the "the further" warehouse.
+ """
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_both.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_2.id,
+ 'name': 'demo',
+ })
+ self.assertEqual(self.product_both.with_context(warehouse=self.warehouse_2.id).qty_available, 100)
+ self.assertEqual(self.product_2.with_context(warehouse=self.warehouse_2.id).qty_available, 100)
+ both_wh_ids = self.both_wh_ids()
+ planner = self.env['sale.order.make.plan'].with_context(warehouse_domain=[('id', 'in', both_wh_ids)], skip_plan_shipping=True).create({'order_id': self.so.id})
+ self.assertTrue(planner.planning_option_ids, 'Must have one or more plans.')
+ self.assertEqual(planner.planning_option_ids.warehouse_id, self.warehouse_2)
+ self.assertFalse(planner.planning_option_ids[0].sub_options)
+
+ def test_42_policy_force_closest(self):
+ """
+ Scenario where an item may not be in stock at "the closest" warehouse, but an item is only allowed
+ to come from "the closest" warehouse.
+ """
+ self.product_2.property_planning_policy_id = self.policy_closest
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_both.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_2.id,
+ 'name': 'demo',
+ })
+ self.assertEqual(self.product_both.with_context(warehouse=self.warehouse_1.id).qty_available, 100)
+ # Close warehouse doesn't have product.
+ self.assertEqual(self.product_2.with_context(warehouse=self.warehouse_1.id).qty_available, 0)
+ both_wh_ids = self.both_wh_ids()
+ planner = self.env['sale.order.make.plan'].with_context(warehouse_domain=[('id', 'in', both_wh_ids)],
+ skip_plan_shipping=True).create({'order_id': self.so.id})
+ self.assertTrue(planner.planning_option_ids, 'Must have one or more plans.')
+ self.assertEqual(planner.planning_option_ids.warehouse_id, self.warehouse_1)
+ self.assertFalse(planner.planning_option_ids[0].sub_options)
+
+ def test_43_policy_merge(self):
+ """
+ Scenario that will make a complicated scenario specifically:
+ - 3 policy groups
+ - 2 base options with sub_options (all base options with same warehouse)
+ """
+ self.product_both.property_planning_policy_id = self.policy_closest
+ self.product_12.property_planning_policy_id = self.policy_other
+ self.product_22.property_planning_policy_id = self.policy_other
+
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_both.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_1.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_2.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_12.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_22.id,
+ 'name': 'demo',
+ })
+ both_wh_ids = self.both_wh_ids()
+ planner = self.env['sale.order.make.plan'].with_context(warehouse_domain=[('id', 'in', both_wh_ids)],
+ skip_plan_shipping=True).create({'order_id': self.so.id})
+ self.assertTrue(planner.planning_option_ids, 'Must have one or more plans.')
+ self.assertEqual(planner.planning_option_ids.warehouse_id, self.warehouse_1)
+ self.assertTrue(planner.planning_option_ids.sub_options)
+
+ sub_options = json_decode(planner.planning_option_ids.sub_options)
+ _logger.warning(sub_options)
+ wh_1_ids = sorted([self.product_both.id, self.product_1.id, self.product_12.id])
+ wh_2_ids = sorted([self.product_2.id, self.product_22.id])
+ self.assertEqual(sorted(sub_options[str(self.warehouse_1.id)]['product_ids']), wh_1_ids)
+ self.assertEqual(sorted(sub_options[str(self.warehouse_2.id)]['product_ids']), wh_2_ids)
+
+ def test_44_policy_merge_2(self):
+ """
+ Scenario that will make a complicated scenario specifically:
+ - 3 policy groups
+ - 2 base options from different warehouses
+ """
+ self.product_both.property_planning_policy_id = self.policy_other
+ self.product_12.property_planning_policy_id = self.policy_closest
+ self.product_22.property_planning_policy_id = self.policy_other
+
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_both.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_1.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_2.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_12.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_22.id,
+ 'name': 'demo',
+ })
+ both_wh_ids = self.both_wh_ids()
+ planner = self.env['sale.order.make.plan'].with_context(warehouse_domain=[('id', 'in', both_wh_ids)],
+ skip_plan_shipping=True).create({'order_id': self.so.id})
+ self.assertTrue(planner.planning_option_ids, 'Must have one or more plans.')
+ self.assertEqual(planner.planning_option_ids.warehouse_id, self.warehouse_2)
+ self.assertTrue(planner.planning_option_ids.sub_options)
+
+ sub_options = json_decode(planner.planning_option_ids.sub_options)
+ _logger.warning(sub_options)
+ wh_1_ids = sorted([self.product_1.id, self.product_12.id])
+ wh_2_ids = sorted([self.product_both.id, self.product_2.id, self.product_22.id])
+ self.assertEqual(sorted(sub_options[str(self.warehouse_1.id)]['product_ids']), wh_1_ids)
+ self.assertEqual(sorted(sub_options[str(self.warehouse_2.id)]['product_ids']), wh_2_ids)
+
+ def test_45_policy_merge_3(self):
+ """
+ Different order of products for test_44
+ - 3 policy groups
+ - 2 base options from different warehouses
+ """
+ self.product_both.property_planning_policy_id = self.policy_other
+ self.product_12.property_planning_policy_id = self.policy_closest
+ self.product_22.property_planning_policy_id = self.policy_other
+
+
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_1.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_2.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_12.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_22.id,
+ 'name': 'demo',
+ })
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_both.id,
+ 'name': 'demo',
+ })
+ both_wh_ids = self.both_wh_ids()
+ planner = self.env['sale.order.make.plan'].with_context(warehouse_domain=[('id', 'in', both_wh_ids)],
+ skip_plan_shipping=True).create({'order_id': self.so.id})
+ self.assertTrue(planner.planning_option_ids, 'Must have one or more plans.')
+ self.assertEqual(planner.planning_option_ids.warehouse_id, self.warehouse_1)
+ self.assertTrue(planner.planning_option_ids.sub_options)
+
+ sub_options = json_decode(planner.planning_option_ids.sub_options)
+ _logger.warning(sub_options)
+ wh_1_ids = sorted([self.product_1.id, self.product_12.id])
+ wh_2_ids = sorted([self.product_both.id, self.product_2.id, self.product_22.id])
+ self.assertEqual(sorted(sub_options[str(self.warehouse_1.id)]['product_ids']), wh_1_ids)
+ self.assertEqual(sorted(sub_options[str(self.warehouse_2.id)]['product_ids']), wh_2_ids)
+
+ def test_51_policy_specific_warehouse(self):
+ """
+ Force one item to TWH2.
+ """
+ self.product_both.property_planning_policy_id = self.policy_wh_2
+
+ self.env['sale.order.line'].create({
+ 'order_id': self.so.id,
+ 'product_id': self.product_both.id,
+ 'name': 'demo',
+ })
+ both_wh_ids = self.both_wh_ids()
+ planner = self.env['sale.order.make.plan'].with_context(warehouse_domain=[('id', 'in', both_wh_ids)],
+ skip_plan_shipping=True).create({'order_id': self.so.id})
+ self.assertTrue(planner.planning_option_ids, 'Must have one or more plans.')
+ self.assertEqual(planner.planning_option_ids.warehouse_id, self.warehouse_2)
diff --git a/sale_planner/views/delivery.xml b/sale_planner/views/delivery.xml
new file mode 100644
index 00000000..16e36513
--- /dev/null
+++ b/sale_planner/views/delivery.xml
@@ -0,0 +1,13 @@
+
+
+
+ delivery.carrier.form.calendar
+ delivery.carrier
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sale_planner/views/product.xml b/sale_planner/views/product.xml
new file mode 100644
index 00000000..aed5aec5
--- /dev/null
+++ b/sale_planner/views/product.xml
@@ -0,0 +1,23 @@
+
+
+
+ product.template.common.form.inherit
+ product.template
+
+
+
+
+
+
+
+
+ product.category.form.inherit
+ product.category
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sale_planner/views/res_config_settings_views.xml b/sale_planner/views/res_config_settings_views.xml
new file mode 100644
index 00000000..69b215f7
--- /dev/null
+++ b/sale_planner/views/res_config_settings_views.xml
@@ -0,0 +1,39 @@
+
+
+
+
+ res.config.settings.view.form.inherit
+ res.config.settings
+
+
+
+
+
Sale Order Planner
+
+
+
+
+
+ Add a carrier that represents the 'base rate' for a carrier's type.
+ For example, you should add 1 FedEx carrier here and let us build up the
+ rates for your other FedEx shipping methods.
+
+
+
+
+
+
+
+
+
+ Warehouses you typically ship inventory out of that you want to
+ include in the planning of sale orders.
+
+
+
+
+
+
+
+
+
diff --git a/sale_planner/views/sale.xml b/sale_planner/views/sale.xml
new file mode 100644
index 00000000..aec860a2
--- /dev/null
+++ b/sale_planner/views/sale.xml
@@ -0,0 +1,17 @@
+
+
+
+ sale.order.form.planner
+ sale.order
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sale_planner/views/stock.xml b/sale_planner/views/stock.xml
new file mode 100644
index 00000000..81d0f78e
--- /dev/null
+++ b/sale_planner/views/stock.xml
@@ -0,0 +1,14 @@
+
+
+
+ stock.warehouse.shipping.calendar
+ stock.warehouse
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sale_planner/wizard/__init__.py b/sale_planner/wizard/__init__.py
new file mode 100644
index 00000000..48b8dc48
--- /dev/null
+++ b/sale_planner/wizard/__init__.py
@@ -0,0 +1,3 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from . import order_planner
diff --git a/sale_planner/wizard/order_planner.py b/sale_planner/wizard/order_planner.py
new file mode 100644
index 00000000..e6727a9a
--- /dev/null
+++ b/sale_planner/wizard/order_planner.py
@@ -0,0 +1,921 @@
+# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
+
+from math import sin, cos, sqrt, atan2, radians
+from json import dumps, loads
+from copy import deepcopy
+from datetime import datetime, timedelta
+from collections import defaultdict
+from logging import getLogger
+
+_logger = getLogger(__name__)
+
+try:
+ from uszipcode import SearchEngine
+except ImportError:
+ _logger.warn('module "uszipcode" cannot be loaded, falling back to Google API')
+ SearchEngine = None
+
+from odoo import api, fields, models
+from odoo.tools.safe_eval import safe_eval
+from ..models.res_config_settings import sale_planner_warehouse_ids, sale_planner_carrier_ids
+
+
+class FakeCollection():
+ def __init__(self, vals):
+ self._vals = vals
+
+ def __iter__(self):
+ for v in self._vals:
+ yield v
+
+ def filtered(self, f):
+ return self.__class__([v for v in self._vals if f(v)])
+ # return filter(f, self.vals)
+
+ def mapped(self, s):
+ # note this only maps to one level and doesn't really support recordset
+ return [v[s] for v in self._vals]
+
+ def sudo(self, *args, **kwargs):
+ return self
+
+ def __bool__(self):
+ # FakeCollection can be empty, all subclasses cannot (currently)
+ if self.__class__ != FakeCollection:
+ return True
+ return bool(self._vals)
+
+
+class FakePartner(FakeCollection):
+ def __init__(self, **kwargs):
+ """
+ 'delivery.carrier'.verify_carrier(contact) ->
+ country_id,
+ state_id,
+ zip
+ company
+
+ city,
+
+ `distance calculations` ->
+ date_localization,
+ partner_latitude,
+ partner_longitude
+
+ computes them when accessed
+ """
+ self.partner_latitude = 0.0
+ 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)
+
+ @property
+ def date_localization(self):
+ if not self._date_localization:
+ try:
+ self._date_localization = 'TODAY!'
+ # The fast way.
+ if SearchEngine and self.zip:
+ with SearchEngine() as search:
+ zipcode = search.by_zipcode(str(self.zip).split('-')[0])
+ if zipcode and zipcode.lat:
+ self.partner_latitude = zipcode.lat
+ self.partner_longitude = zipcode.lng
+ return self._date_localization
+
+ # The slow way.
+ geo_obj = self.env['base.geocoder']
+ search = geo_obj.geo_query_address(city=self.city, state=self.state_id.name, country=self.country_id.name)
+ result = geo_obj.geo_find(search, force_country=self.country_id.id)
+ if result:
+ self.partner_latitude = result[0]
+ self.partner_longitude = result[1]
+ except:
+ self._date_localization = 'ERROR'
+ return self._date_localization
+
+ def __getattr__(self, item):
+ return False
+
+ def __getitem__(self, item):
+ if item == '__last_update':
+ return str(datetime.now())
+ return getattr(self, item)
+
+
+class FakeOrderLine(FakeCollection):
+ def __init__(self, **kwargs):
+ """
+ 'delivery.carrier'.get_price_available(order) ->
+ state,
+ is_delivery,
+ product_uom._compute_quantity,
+ product_uom_qty,
+ product_id
+ price_total
+
+
+ """
+ self.state = 'draft'
+ self.is_delivery = False
+ self.product_uom = self
+
+ for attr, value in kwargs.items():
+ setattr(self, attr, value)
+
+ def _compute_quantity(self, qty=1, uom=None):
+ """
+ This is a non-implementation for when someone wants to call product_uom._compute_quantity
+ :param qty:
+ :param uom:
+ :return:
+ """
+ return qty
+
+ def __getattr__(self, item):
+ return False
+
+ def __getitem__(self, item):
+ if item == '__last_update':
+ return str(datetime.now())
+ return getattr(self, item)
+
+
+class FakeSaleOrder(FakeCollection):
+ """
+ partner_id :: used in shipping
+ partner_shipping_id :: is used in several places
+ order_line :: can be a FakeCollection of FakeOrderLine's or Odoo 'sale.order.line'
+ carrier_id :: can be empty, will be overwritten when walking through carriers
+
+ 'delivery.carrier'.get_shipping_price_from_so(orders) ->
+ id, (int)
+ name, (String)
+ currency_id, (Odoo 'res.currency')
+ company_id, (Odoo 'res.company')
+ warehouse_id, (Odoo 'stock.warehouse')
+ carrier_id, (Odoo 'delivery.carrier')
+
+ SaleOrderMakePlan.generate_shipping_options() ->
+ pricelist_id, (Odoo 'product.pricelist')
+ """
+ def __init__(self, **kwargs):
+ self.carrier_id = None
+ self.id = 0
+ self.name = 'Quote'
+ self.team_id = None
+ self.analytic_account_id = None
+ self.amount_total = 0.0
+ self.date_order = fields.Date.today()
+ self.shipping_account_id = False # from delivery_hibou
+ self.ups_service_type = False # Added in 12
+ for attr, value in kwargs.items():
+ setattr(self, attr, value)
+
+ def __iter__(self):
+ """
+ Emulate a recordset of a single order.
+ """
+ yield self
+
+ def _compute_amount_total_without_delivery(self):
+ return self.amount_total
+
+ def __getattr__(self, item):
+ return False
+
+ def __getitem__(self, item):
+ if item == '__last_update':
+ return str(datetime.now())
+ return getattr(self, item)
+
+ def _get_estimated_weight(self):
+ weight = 0.0
+ for order_line in self.order_line.filtered(lambda l: l.product_id.type in ['product', 'consu'] and not l.is_delivery and not l.display_type):
+ weight += order_line.product_qty * order_line.product_id.weight
+ return weight
+
+
+def distance(lat_1, lon_1, lat_2, lon_2):
+ R = 6373.0
+
+ lat1 = radians(lat_1)
+ lon1 = radians(lon_1)
+ lat2 = radians(lat_2)
+ lon2 = radians(lon_2)
+
+ dlon = lon2 - lon1
+ dlat = lat2 - lat1
+
+ a = sin(dlat / 2) ** 2 + cos(lat1) * cos(lat2) * sin(dlon / 2) ** 2
+ c = 2 * atan2(sqrt(a), sqrt(1 - a))
+
+ return R * c
+
+
+class SaleOrderMakePlan(models.TransientModel):
+ _name = 'sale.order.make.plan'
+ _description = 'Plan Order'
+
+ order_id = fields.Many2one(
+ 'sale.order', 'Sale Order',
+ )
+ planning_option_ids = fields.One2many('sale.order.planning.option', 'plan_id', 'Options')
+
+ @api.model
+ def plan_order(self, vals):
+ pass
+
+ def select_option(self, option):
+ for plan in self:
+ self.plan_order_option(plan.order_id, option)
+
+ def _order_fields_for_option(self, option):
+ return {
+ 'warehouse_id': option.warehouse_id.id,
+ 'requested_date': option.requested_date,
+ 'date_planned': option.date_planned,
+ 'carrier_id': option.carrier_id.id,
+ }
+
+ @api.model
+ def plan_order_option(self, order, option):
+ if option.sub_options:
+ sub_options = option.sub_options
+ if isinstance(sub_options, str):
+ sub_options = loads(sub_options)
+ if not isinstance(sub_options, dict):
+ _logger.warning('Cannot apply option with corrupt sub_options')
+ return False
+ order_lines = order.order_line
+ for wh_id, wh_vals in sub_options.items():
+ wh_id = int(wh_id)
+ if wh_id == option.warehouse_id.id:
+ continue
+ order_lines.filtered(lambda line: line.product_id.id in wh_vals['product_ids']).write({
+ 'warehouse_id': wh_id,
+ 'date_planned': wh_vals.get('date_planned'),
+ })
+
+ order_fields = self._order_fields_for_option(option)
+
+ order.write(order_fields)
+
+ if option.carrier_id:
+ order._create_delivery_line(option.carrier_id, option.shipping_price)
+
+
+ @api.model
+ def create(self, values):
+ planner = super(SaleOrderMakePlan, self).create(values)
+
+ for option_vals in self.generate_order_options(planner.order_id):
+ if type(option_vals) != dict:
+ continue
+ option_vals['plan_id'] = planner.id
+ planner.planning_option_ids |= self.env['sale.order.planning.option'].create(option_vals)
+
+ return planner
+
+ def _fake_order(self, order):
+ return FakeSaleOrder(**{
+ 'id': order.id,
+ 'name': order.name,
+ 'partner_id': order.partner_id,
+ 'partner_shipping_id': order.partner_shipping_id,
+ 'order_line': order.order_line,
+ 'currency_id': order.currency_id,
+ 'company_id': order.company_id,
+ 'warehouse_id': order.warehouse_id,
+ 'amount_total': order.amount_total,
+ 'pricelist_id': order.pricelist_id,
+ 'env': self.env,
+ })
+
+ @api.model
+ def generate_order_options(self, order, plan_shipping=True):
+ fake_order = self._fake_order(order)
+ base_option = self.generate_base_option(fake_order)
+ # do we need shipping?
+ # we need to collect it because we want multi-warehouse shipping amounts.
+ if order.carrier_id:
+ base_option['carrier_id'] = order.carrier_id.id
+
+ if plan_shipping and not self.env.context.get('skip_plan_shipping'):
+ if base_option.get('date_planned'):
+ fake_order.date_order = base_option['date_planned']
+ options = self.generate_shipping_options(base_option, fake_order)
+ else:
+ options = [base_option]
+
+ return options
+
+ def get_warehouses(self, warehouse_id=None, domain=None):
+ warehouse = self.env['stock.warehouse'].sudo()
+ if warehouse_id:
+ return warehouse.browse(warehouse_id)
+
+ if domain:
+ if not isinstance(domain, (list, tuple)):
+ domain = safe_eval(domain)
+ else:
+ domain = []
+ if 'allowed_company_ids' in self.env.context:
+ domain.append(('company_id', 'in', self.env.context['allowed_company_ids']))
+
+ if self.env.context.get('warehouse_domain'):
+ if not domain:
+ domain = []
+ domain.extend(self.env.context.get('warehouse_domain'))
+ if domain:
+ return warehouse.search(domain)
+
+ # no domain, use global
+ warehouse_ids = sale_planner_warehouse_ids(self.env, self.env.user.company_id)
+ return warehouse.browse(warehouse_ids)
+
+ def get_shipping_carriers(self, carrier_id=None, domain=None, warehouse_id=None):
+ Carrier = self.env['delivery.carrier'].sudo()
+ if carrier_id:
+ return Carrier.browse(carrier_id)
+
+ if domain:
+ if not isinstance(domain, (list, tuple)):
+ domain = safe_eval(domain)
+
+ if self.env.context.get('carrier_domain'):
+ if not domain:
+ domain = []
+ domain.extend(self.env.context.get('carrier_domain'))
+ if domain:
+ return Carrier.search(domain)
+
+ # no domain, use global
+ if warehouse_id:
+ warehouse = self.env['stock.warehouse'].sudo().browse(warehouse_id)
+ if warehouse.sale_planner_carrier_ids:
+ return warehouse.sale_planner_carrier_ids.sudo()
+ carrier_ids = sale_planner_carrier_ids(self.env, self.env.user.company_id)
+ return Carrier.browse(carrier_ids)
+
+ def _generate_base_option(self, order_fake, policy_group):
+ flag_force_closest = False
+ warehouse_domain = False
+ if 'policy' in policy_group:
+ policy = policy_group['policy']
+ flag_force_closest = policy.always_closest_warehouse
+ warehouse_domain = policy.warehouse_filter_id.domain
+ # Need to look at warehouse filter.
+ # Eventually need to look at shipping filter....
+
+ warehouses = self.get_warehouses(domain=warehouse_domain)
+ if flag_force_closest:
+ warehouses = self._find_closest_warehouse_by_partner(warehouses, order_fake.partner_shipping_id)
+ product_stock = self._fetch_product_stock(warehouses, policy_group['products'])
+ sub_options = {}
+ wh_date_planning = {}
+
+ p_len = len(policy_group['products'])
+ full_candidates = set()
+ partial_candidates = set()
+ for wh_id, stock in product_stock.items():
+ available = sum(1 for p_id, p_vals in stock.items() if self._is_in_stock(p_vals, policy_group['buy_qty'][p_id]))
+ if available == p_len:
+ full_candidates.add(wh_id)
+ elif available > 0:
+ partial_candidates.add(wh_id)
+
+ if full_candidates:
+ if len(full_candidates) == 1:
+ warehouse = warehouses.filtered(lambda wh: wh.id in full_candidates)
+ else:
+ warehouse = self._find_closest_warehouse_by_partner(
+ warehouses.filtered(lambda wh: wh.id in full_candidates), order_fake.partner_shipping_id)
+ date_planned = self._next_warehouse_shipping_date(warehouse)
+ #order_fake.warehouse_id = warehouse
+ return {'warehouse_id': warehouse.id, 'date_planned': date_planned}
+
+ _logger.warning(' partial_candidates: ' + str(partial_candidates))
+ if partial_candidates:
+ _logger.warning(' using...')
+ if len(partial_candidates) == 1:
+ warehouse = warehouses.filtered(lambda wh: wh.id in partial_candidates)
+ #order_fake.warehouse_id = warehouse
+ return {'warehouse_id': warehouse.id}
+
+ sorted_warehouses = self._sort_warehouses_by_partner(
+ warehouses.filtered(lambda wh: wh.id in partial_candidates), order_fake.partner_shipping_id)
+ _logger.warning(' 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.warning(' 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.warning(' 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] = {
+ 'date_planned': self._next_warehouse_shipping_date(wh),
+ 'product_ids': [],
+ 'product_skus': [],
+ }
+ sub_options[wh.id]['product_ids'].append(p_id)
+ sub_options[wh.id]['product_skus'].append(p_vals['sku'])
+ _logger.warning(' removing: ' + str(p_id))
+ del policy_group['buy_qty'][p_id]
+
+ if not policy_group['buy_qty']:
+ # item_details can fulfil all items.
+ # this is good!!
+ #order_fake.warehouse_id = primary_wh
+ return {'warehouse_id': primary_wh.id, 'date_planned': primary_wh_date_planned,
+ 'sub_options': sub_options}
+
+ # warehouses cannot fulfil all requested items!!
+ #order_fake.warehouse_id = primary_wh
+ return {'warehouse_id': primary_wh.id}
+
+ # nobody has stock!
+ primary_wh = self._find_closest_warehouse_by_partner(warehouses, order_fake.partner_shipping_id)
+ return {'warehouse_id': primary_wh.id}
+
+ def generate_base_option(self, order_fake):
+ _logger.warning('generate_base_option:')
+ __start_date = datetime.now() - timedelta(days=30)
+ product_lines = list(filter(lambda line: line.product_id.type == 'product', order_fake.order_line))
+ if not product_lines:
+ return {}
+
+ buy_qty = defaultdict(int)
+ for line in product_lines:
+ buy_qty[line.product_id.id] += line.product_uom_qty
+
+ products = self.env['product.product']
+ for line in product_lines:
+ products |= line.product_id
+
+ policy_groups = defaultdict(lambda: {'products': [], 'buy_qty': {}})
+ for p in products:
+ policy = p.product_tmpl_id.get_planning_policy()
+ if policy:
+ policy_groups[policy.id]['products'].append(p)
+ policy_groups[policy.id]['buy_qty'][p.id] = buy_qty[p.id]
+ policy_groups[policy.id]['policy'] = policy
+ else:
+ policy_groups[0]['products'].append(p)
+ policy_groups[0]['buy_qty'][p.id] = buy_qty[p.id]
+
+ for _, policy_group in policy_groups.items():
+ product_set = self.env['product.product'].browse()
+ for p in policy_group['products']:
+ product_set += p
+ policy_group['products'] = product_set
+ policy_group['base_option'] = self._generate_base_option(order_fake, policy_group)
+
+ option_policy_groups = defaultdict(lambda: {'products': self.env['product.product'].browse(), 'policies': self.env['sale.order.planning.policy'].browse(), 'date_planned': __start_date, 'sub_options': [],})
+ for policy_id, policy_group in policy_groups.items():
+ base_option = policy_group['base_option']
+ _logger.warning(' 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']
+ if option_policy_groups[b_wh_id].get('date_planned'):
+ # The first base_option without a date clears it
+ if base_option.get('date_planned'):
+ if base_option['date_planned'] > option_policy_groups[b_wh_id]['date_planned']:
+ option_policy_groups[b_wh_id]['date_planned'] = base_option['date_planned']
+ else:
+ # One of our options has no plan date. Remove it.
+ del option_policy_groups[b_wh_id]['date_planned']
+ if 'sub_options' in base_option:
+ option_policy_groups[b_wh_id]['sub_options'].append(base_option['sub_options'])
+ option_policy_groups[b_wh_id]['products'] += policy_group['products']
+ option_policy_groups[b_wh_id]['warehouse_id'] = b_wh_id
+
+ # clean up unused sub_options and collapse used ones
+ for o_wh_id, option_group in option_policy_groups.items():
+ if not option_group['sub_options']:
+ del option_group['sub_options']
+ else:
+ sub_options = defaultdict(lambda: {'date_planned': __start_date, 'product_ids': [], 'product_skus': []})
+ remaining_products = option_group['products']
+ for options in option_group['sub_options']:
+ for wh_id, option in options.items():
+ if sub_options[wh_id].get('date_planned'):
+ # The first option without a date clears it
+ if option.get('date_planned'):
+ if option['date_planned'] > sub_options[wh_id]['date_planned']:
+ sub_options[wh_id]['date_planned'] = option['date_planned']
+ else:
+ del sub_options[wh_id]['date_planned']
+ sub_options[wh_id]['product_ids'] += option['product_ids']
+ sub_options[wh_id]['product_skus'] += option['product_skus']
+ remaining_products = remaining_products.filtered(lambda p: p.id not in sub_options[wh_id]['product_ids'])
+ option_group['sub_options'] = sub_options
+ if remaining_products:
+ option_group['sub_options'][o_wh_id]['product_ids'] += remaining_products.ids
+ option_group['sub_options'][o_wh_id]['product_skus'] += remaining_products.mapped('default_code')
+
+
+ # At this point we should have all of the policy options collapsed.
+ # Collapse warehouse options.
+ base_option = {'date_planned': __start_date, 'products': self.env['product.product'].browse()}
+ for wh_id, intermediate_option in option_policy_groups.items():
+ _logger.warning(' base_option: ' + str(base_option))
+ _logger.warning(' 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']
+
+ if base_option.get('date_planned'):
+ if intermediate_option.get('date_planned'):
+ if intermediate_option['date_planned'] > base_option['date_planned']:
+ base_option['date_planned'] = intermediate_option['date_planned']
+ else:
+ del base_option['date_planned']
+ if 'sub_options' in base_option:
+ for _, option in base_option['sub_options'].items():
+ del option['date_planned']
+ if b_wh_id == wh_id:
+ if 'sub_options' in intermediate_option and 'sub_options' not in base_option:
+ # Base option will get new sub_options
+ intermediate_option['sub_options'][wh_id]['product_ids'] += base_option['products'].ids
+ intermediate_option['sub_options'][wh_id]['product_skus'] += base_option['products'].mapped('default_code')
+ base_option['sub_options'] = intermediate_option['sub_options']
+ elif 'sub_options' in intermediate_option and 'sub_options' in base_option:
+ # Both have sub_options, merge
+ for o_wh_id, option in intermediate_option['sub_options'].items():
+ if o_wh_id not in base_option['sub_options']:
+ base_option['sub_options'][o_wh_id] = option
+ else:
+ base_option['sub_options'][o_wh_id]['product_ids'] += option['product_ids']
+ base_option['sub_options'][o_wh_id]['product_skus'] += option['product_skus']
+ if base_option.get('date_planned'):
+ if option['date_planned'] > base_option['sub_options'][o_wh_id]['date_planned']:
+ base_option['sub_options'][o_wh_id]['date_planned'] = intermediate_option['date_planned']
+ elif 'sub_options' in base_option:
+ # merge products from intermediate into base_option's sub_options
+ base_option['sub_options'][wh_id]['product_ids'] += intermediate_option['products'].ids
+ base_option['sub_options'][wh_id]['product_skus'] += intermediate_option['products'].mapped('default_code')
+ base_option['products'] += intermediate_option['products']
+ else:
+ # Promote
+ if 'sub_options' not in intermediate_option and 'sub_options' not in base_option:
+ base_option['sub_options'] = {
+ wh_id: {
+ 'product_ids': intermediate_option['products'].ids,
+ 'product_skus': intermediate_option['products'].mapped('default_code'),
+ },
+ b_wh_id: {
+ 'product_ids': base_option['products'].ids,
+ 'product_skus': base_option['products'].mapped('default_code'),
+ },
+ }
+ if base_option.get('date_planned'):
+ base_option['sub_options'][wh_id]['date_planned'] = intermediate_option['date_planned']
+ base_option['sub_options'][b_wh_id]['date_planned'] = base_option['date_planned']
+ elif 'sub_options' in base_option and 'sub_options' not in intermediate_option:
+ if wh_id not in base_option['sub_options']:
+ base_option['sub_options'][wh_id] = {
+ 'product_ids': intermediate_option['products'].ids,
+ 'product_skus': intermediate_option['products'].mapped('default_code'),
+ }
+ if base_option.get('date_planned'):
+ base_option['sub_options'][wh_id]['date_planned'] = intermediate_option['date_planned']
+ else:
+ base_option['sub_options'][wh_id]['product_ids'] += intermediate_option['products'].ids
+ base_option['sub_options'][wh_id]['product_skus'] += intermediate_option['products'].mapped('default_code')
+ if base_option.get('date_planned'):
+ if intermediate_option['date_planned'] > base_option['sub_options'][wh_id]['date_planned']:
+ base_option['sub_options'][wh_id]['date_planned'] = intermediate_option['date_planned']
+ elif 'sub_options' in intermediate_option and 'sub_options' in base_option:
+ # Both have sub_options, merge
+ for o_wh_id, option in intermediate_option['sub_options'].items():
+ if o_wh_id not in base_option['sub_options']:
+ base_option['sub_options'][o_wh_id] = option
+ else:
+ base_option['sub_options'][o_wh_id]['product_ids'] += option['product_ids']
+ base_option['sub_options'][o_wh_id]['product_skus'] += option['product_skus']
+ if base_option.get('date_planned'):
+ if option['date_planned'] > base_option['sub_options'][o_wh_id]['date_planned']:
+ base_option['sub_options'][o_wh_id]['date_planned'] = intermediate_option['date_planned']
+ else:
+ # intermediate_option has sub_options but base_option doesn't
+ base_option['sub_options'] = {
+ b_wh_id: {
+ 'product_ids': base_option['products'].ids,
+ 'product_skus': base_option['products'].mapped('default_code'),
+ }
+ }
+ if base_option.get('date_planned'):
+ base_option['sub_options'][b_wh_id]['date_planned'] = base_option['date_planned']
+ for o_wh_id, option in intermediate_option['sub_options'].items():
+ if o_wh_id not in base_option['sub_options']:
+ base_option['sub_options'][o_wh_id] = option
+ else:
+ base_option['sub_options'][o_wh_id]['product_ids'] += option['product_ids']
+ base_option['sub_options'][o_wh_id]['product_skus'] += option['product_skus']
+ if base_option.get('date_planned'):
+ if option['date_planned'] > base_option['sub_options'][o_wh_id]['date_planned']:
+ base_option['sub_options'][o_wh_id]['date_planned'] = intermediate_option['date_planned']
+
+ del base_option['products']
+ _logger.warning(' returning: ' + str(base_option))
+ order_fake.warehouse_id = self.get_warehouses(warehouse_id=base_option['warehouse_id'])
+ return base_option
+
+ def _is_in_stock(self, p_stock, buy_qty):
+ return p_stock['type'] == 'consu' or p_stock['qty_available'] >= buy_qty
+
+ def _find_closest_warehouse_by_partner(self, warehouses, partner):
+ if not partner.date_localization:
+ partner.geo_localize()
+ return self._find_closest_warehouse(warehouses, partner.partner_latitude, partner.partner_longitude)
+
+ def _find_closest_warehouse(self, warehouses, latitude, longitude):
+ if not warehouses:
+ return warehouses
+ distances = {distance(latitude, longitude, wh.partner_id.partner_latitude, wh.partner_id.partner_longitude): wh.id for wh in warehouses}
+ wh_id = distances[min(distances)]
+ return warehouses.filtered(lambda wh: wh.id == wh_id)
+
+ def _sort_warehouses_by_partner(self, warehouses, partner):
+ if not partner.date_localization:
+ partner.geo_localize()
+ return self._sort_warehouses(warehouses, partner.partner_latitude, partner.partner_longitude)
+
+ def _sort_warehouses(self, warehouses, latitude, longitude):
+ distances = {distance(latitude, longitude, wh.partner_id.partner_latitude, wh.partner_id.partner_longitude): wh.id for wh in warehouses}
+ wh_distances = sorted(distances)
+ return [warehouses.filtered(lambda wh: wh.id == distances[d]) for d in wh_distances]
+
+ def _next_warehouse_shipping_date(self, warehouse):
+ if warehouse.shipping_calendar_id:
+ return warehouse.shipping_calendar_id.plan_days_end(0, fields.Datetime.now(), compute_leaves=True)
+ return False
+
+ @api.model
+ def _fetch_product_stock(self, warehouses, products):
+ output = {}
+ for wh in warehouses:
+ products._invalidate_cache(fnames=['qty_available', 'virtual_available', 'incoming_qty', 'outgoing_qty'],
+ ids=products.ids)
+ products = products.with_context({'location': wh.lot_stock_id.id})
+ output[wh.id] = {
+ p.id: {
+ 'qty_available': p.qty_available,
+ 'virtual_available': p.virtual_available,
+ 'incoming_qty': p.incoming_qty,
+ 'outgoing_qty': p.outgoing_qty,
+ 'sku': p.default_code or str(p.id),
+ 'type': p.type,
+ } for p in products}
+ return output
+
+ def generate_shipping_options(self, base_option, order_fake):
+ # generate a carrier_id, amount, requested_date (promise date)
+ # if base_option['carrier_id'] then that is the only carrier we want to collect rates for.
+ product_lines = list(filter(lambda line: line.product_id.type in ('product', 'consu'), order_fake.order_line))
+ domain = []
+ for line in product_lines:
+ policy = line.product_id.product_tmpl_id.get_planning_policy()
+ if policy and policy.carrier_filter_id:
+ domain.extend(safe_eval(policy.carrier_filter_id.domain))
+ carriers = self.get_shipping_carriers(base_option.get('carrier_id'), domain=domain, warehouse_id=base_option.get('warehouse_id'))
+ _logger.info('generate_shipping_options:: base_option: ' + str(base_option) + ' order_fake: ' + str(order_fake) + ' carriers: ' + str(carriers))
+
+ if not carriers:
+ return [base_option]
+
+ if not base_option.get('sub_options'):
+ options = []
+ # this locic comes from "delivery.models.sale_order.SaleOrder"
+ for carrier in carriers:
+ carrier_options = self._generate_shipping_carrier_option(base_option, order_fake, carrier)
+ if carrier_options:
+ options += carrier_options
+ if options:
+ return options
+ return [base_option]
+ else:
+ warehouses = self.get_warehouses()
+ original_order_fake_warehouse_id = order_fake.warehouse_id
+ original_order_fake_order_line = order_fake.order_line
+ options = []
+ for carrier in carriers:
+ new_base_option = deepcopy(base_option)
+ has_error = False
+ found_carrier_ids = set()
+ for wh_id, wh_vals in base_option['sub_options'].items():
+ if has_error:
+ continue
+ order_fake.warehouse_id = warehouses.filtered(lambda wh: wh.id == wh_id)
+ order_fake.order_line = FakeCollection(list(filter(lambda line: line.product_id.id in wh_vals['product_ids'], original_order_fake_order_line)))
+ wh_carrier_options = self._generate_shipping_carrier_option(wh_vals, order_fake, carrier)
+ if not wh_carrier_options:
+ has_error = True
+ else:
+ for _option in wh_carrier_options:
+ if _option.get('carrier_id'):
+ found_carrier_ids.add(_option['carrier_id'])
+ new_base_option['sub_options'][wh_id] = wh_carrier_options
+
+ if has_error:
+ continue
+
+ # now that we've collected details for this carrier, we likely have more than one carrier's rates
+ _logger.info(' from ' + str(carrier) + ' found ' + str(found_carrier_ids))
+ for carrier_id in found_carrier_ids:
+ carrier_option = deepcopy(base_option)
+ carrier_option['carrier_id'] = False
+ for wh_id, wh_vals in base_option['sub_options'].items():
+ for co in new_base_option['sub_options'].get(wh_id, []):
+ if co.get('carrier_id') == carrier_id:
+ # we have found the rate!
+ carrier_option['carrier_id'] = carrier_id
+ carrier_option['sub_options'][wh_id] = co
+ if carrier_option['carrier_id']:
+ carrier_option['shipping_price'] = self._get_shipping_price_for_options(carrier_option['sub_options'])
+ carrier_option['requested_date'] = self._get_max_requested_date(carrier_option['sub_options'])
+ carrier_option['transit_days'] = self._get_max_transit_days(carrier_option['sub_options'])
+ options.append(carrier_option)
+
+ #restore values in case more processing occurs
+ order_fake.warehouse_id = original_order_fake_warehouse_id
+ order_fake.order_line = original_order_fake_order_line
+ if not options:
+ options.append(base_option)
+ return options
+
+ def _get_shipping_price_for_options(self, sub_options):
+ return sum(wh_option.get('shipping_price', 0.0) for wh_option in sub_options.values())
+
+ def _get_max_requested_date(self, sub_options):
+ max_requested_date = None
+ for option in sub_options.values():
+ requested_date = option.get('requested_date')
+ if requested_date and not max_requested_date:
+ max_requested_date = requested_date
+ elif requested_date:
+ if requested_date > max_requested_date:
+ max_requested_date = requested_date
+ return max_requested_date
+
+ def _get_max_transit_days(self, sub_options):
+ return max(wh_option.get('transit_days', 0) or 0 for wh_option in sub_options.values())
+
+ def _generate_shipping_carrier_option(self, base_option, order_fake, carrier):
+ # some carriers look at the order carrier_id
+ order_fake.carrier_id = carrier
+ date_planned = base_option.get('date_planned')
+ order_fake.date_planned = date_planned
+
+ # this logic comes from "delivery.models.sale_order.SaleOrder"
+ try:
+ result = None
+ date_delivered = None
+ transit_days = 0
+ if carrier.delivery_type not in ['fixed', 'base_on_rule']:
+ if hasattr(carrier, 'rate_shipment_multi'):
+ result = carrier.rate_shipment_multi(order=order_fake)
+ elif hasattr(carrier, 'rate_shipment_date_planned'):
+ # New API
+ result = carrier.rate_shipment_date_planned(order_fake, base_option.get('date_planned'))
+ if result:
+ if not result.get('success'):
+ return None
+ price_unit, transit_days, date_delivered = result['price'], result.get('transit_days'), result.get('date_delivered')
+ elif hasattr(carrier, 'get_shipping_price_for_plan'):
+ # Old API
+ result = carrier.get_shipping_price_for_plan(order_fake, base_option.get('date_planned'))
+ if result and isinstance(result, list) and not isinstance(result[0], dict):
+ # this detects the above only if it isn't a list of dictionaries (aka multi-rating result)
+ price_unit, transit_days, date_delivered = result[0]
+ elif not result:
+ rate = carrier.rate_shipment(order_fake)
+ if rate and rate.get('success'):
+ price_unit = rate['price']
+ if rate.get('transit_days'):
+ transit_days = rate.get('transit_days')
+ if rate.get('date_delivered'):
+ date_delivered = rate.get('date_delivered')
+ else:
+ _logger.warning('returning None because carrier: ' + str(carrier) + ' returned rate: ' + str(rate))
+ return None
+ else:
+ carrier = carrier.available_carriers(order_fake.partner_shipping_id)
+ if not carrier:
+ return None
+ res = carrier.rate_shipment(order_fake)
+ price_unit = res['price']
+ if order_fake.company_id.currency_id.id != order_fake.pricelist_id.currency_id.id:
+ price_unit = order_fake.company_id.currency_id.with_context(date=order_fake.date_order).compute(price_unit, order_fake.pricelist_id.currency_id)
+
+ if result and isinstance(result, list):
+ res = []
+ for rate in result:
+ rate_carrier = rate.get('carrier')
+ if not rate_carrier:
+ continue
+ price_unit = rate['price']
+ date_delivered = rate.get('date_delivered')
+ transit_days = rate.get('transit_days')
+
+ if date_planned and transit_days and not date_delivered:
+ # compute from planned date anc current rate carrier
+ date_delivered = rate_carrier.calculate_date_delivered(date_planned, transit_days)
+ elif date_planned and date_delivered and not transit_days:
+ transit_days = rate_carrier.calculate_transit_days(date_planned, date_delivered)
+
+ final_price = float(price_unit) * (1.0 + (float(rate_carrier.margin) / 100.0))
+ option = deepcopy(base_option)
+ option['carrier_id'] = rate_carrier.id
+ option['shipping_price'] = final_price
+ option['requested_date'] = fields.Datetime.to_string(date_delivered) if (date_delivered and isinstance(date_delivered, datetime)) else date_delivered
+ option['transit_days'] = transit_days
+ res.append(option)
+ return res
+ else:
+ final_price = float(price_unit) * (1.0 + (float(carrier.margin) / 100.0))
+ option = deepcopy(base_option)
+ option['carrier_id'] = carrier.id
+ option['shipping_price'] = final_price
+ option['requested_date'] = fields.Datetime.to_string(date_delivered) if (date_delivered and isinstance(date_delivered, datetime)) else date_delivered
+ option['transit_days'] = transit_days
+ return [option]
+ except Exception as e:
+ _logger.info("Exception collecting carrier rates: " + str(e))
+ # Want to see more?
+ # _logger.exception(e)
+
+ return None
+
+
+class SaleOrderPlanningOption(models.TransientModel):
+ _name = 'sale.order.planning.option'
+ _description = 'Order Planning Option'
+
+ def create(self, values):
+ def datetime_converter(o):
+ if isinstance(o, datetime):
+ return str(o)
+ if not isinstance(values, list):
+ values = [values]
+ for option_values in values:
+ if 'sub_options' in option_values and not isinstance(option_values['sub_options'], str):
+ for wh_id, option in option_values['sub_options'].items():
+ if option.get('date_planned'):
+ option['date_planned'] = str(option['date_planned'])
+ option_values['sub_options'] = dumps(option_values['sub_options'], default=datetime_converter)
+ return super(SaleOrderPlanningOption, self).create(values)
+
+ def _compute_sub_options_text(self):
+ for option in self:
+ sub_options = option.sub_options
+ if sub_options and not isinstance(sub_options, dict):
+ sub_options = loads(sub_options)
+ if not isinstance(sub_options, dict):
+ option.sub_options_text = ''
+ continue
+
+ line = ''
+ for wh_id, wh_option in sub_options.items():
+ product_skus = (str(s) for s in wh_option.get('product_skus', []))
+ date_planned = wh_option.get('date_planned') or ''
+ product_skus = ', '.join(product_skus)
+ requested_date = wh_option.get('requested_date', '') or ''
+ shipping_price = float(wh_option.get('shipping_price', 0.0) or 0)
+ transit_days = int(wh_option.get('transit_days', 0) or 0)
+
+ line += """WH %d :: %s
+ Date Planned: %s
+ Requested Date: %s
+ Transit Days: %d
+ Shipping Price: %.2f
+
+""" % (int(wh_id), product_skus, date_planned, requested_date, transit_days, shipping_price)
+
+ option.sub_options_text = line
+
+ plan_id = fields.Many2one('sale.order.make.plan', 'Plan', ondelete='cascade')
+ warehouse_id = fields.Many2one('stock.warehouse', string='Warehouse')
+ date_planned = fields.Datetime('Planned Date')
+ requested_date = fields.Datetime('Requested Date')
+ carrier_id = fields.Many2one('delivery.carrier', string='Carrier')
+ transit_days = fields.Integer('Transit Days')
+ shipping_price = fields.Float('Shipping Price')
+ sub_options = fields.Text('Sub Options JSON')
+ sub_options_text = fields.Text('Sub Options', compute=_compute_sub_options_text)
+
+ def select_plan(self):
+ for option in self:
+ option.plan_id.select_option(option)
+ return
diff --git a/sale_planner/wizard/order_planner_views.xml b/sale_planner/wizard/order_planner_views.xml
new file mode 100644
index 00000000..9fd50a39
--- /dev/null
+++ b/sale_planner/wizard/order_planner_views.xml
@@ -0,0 +1,39 @@
+
+
+
+ view.plan.sale.order
+ sale.order.make.plan
+ form
+
+
+
+
+
+ Plan Sale Order
+ sale.order.make.plan
+ form
+
+ new
+
+
\ No newline at end of file