audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[REL] delivery_fedex_hibou,delivery_gso,delivery_hibou,delivery_ups_hibou,sale_planner,stock_delivery_planner: per-package tracking from 11.0

Browse Source
This commit is contained in:
Jared Kipe
2022-02-07 12:43:01 -08:00
parent ce3d4ed628
commit ca6ec69e2b
50 changed files with 3568 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
stock_delivery_planner/wizard/stock_delivery_planner.py
View File

@@ -1,7 +1,7 @@
# Part of Hibou Suite Professional. See LICENSE_PROFESSIONAL file for full copyright and licensing details.
from odoo import api, fields, models, _
from odoo.tools import safe_eval
from odoo.exceptions import UserError, ValidationError
import logging
_logger = logging.getLogger(__name__)
@@ -26,32 +26,37 @@ class StockDeliveryPlanner(models.TransientModel):
def create(self, values):
planner = super(StockDeliveryPlanner, self).create(values)
base_carriers = self.env['delivery.carrier']
carrier_ids = self.env['ir.config_parameter'].sudo().get_param('stock.delivery.planner.carrier_ids.%s' % (self.env.company.id, ))
if carrier_ids:
try:
carrier_ids = [int(c) for c in carrier_ids.split(',')]
base_carriers = base_carriers.browse(carrier_ids)
except:
pass
base_carriers = planner.picking_id.picking_type_id.warehouse_id.delivery_planner_carrier_ids
if not base_carriers:
carrier_ids = self.env['ir.config_parameter'].sudo().get_param('stock.delivery.planner.carrier_ids.%s' % (self.env.user.company_id.id, ))
if carrier_ids:
try:
carrier_ids = [int(c) for c in carrier_ids.split(',')]
base_carriers = base_carriers.browse(carrier_ids)
except:
pass
base_carriers = base_carriers.sudo()
for carrier in base_carriers:
rates = carrier.rate_shipment_multi(picking=planner.picking_id)
for rate in filter(lambda r: not r.get('success'), rates):
_logger.warning(rate.get('error_message'))
for rate in filter(lambda r: r.get('success'), rates):
rate = self.calculate_delivery_window(rate)
# added late in API dev cycle
package = rate.get('package') or self.env['stock.quant.package'].browse()
planner.plan_option_ids |= planner.plan_option_ids.create({
'plan_id': self.id,
'carrier_id': rate['carrier'].id,
'package_id': package.id,
'price': rate['price'],
'date_planned': rate['date_planned'],
'requested_date': rate['date_delivered'],
'transit_days': rate['transit_days'],
})
try:
rates = carrier.rate_shipment_multi(picking=planner.picking_id)
for rate in filter(lambda r: not r.get('success'), rates):
_logger.warning(rate.get('error_message'))
for rate in filter(lambda r: r.get('success'), rates):
rate = self.calculate_delivery_window(rate)
# added late in API dev cycle
package = rate.get('package') or self.env['stock.quant.package'].browse()
planner.plan_option_ids |= planner.plan_option_ids.create({
'plan_id': self.id,
'carrier_id': rate['carrier'].id,
'package_id': package.id,
'price': rate['price'],
'date_planned': rate['date_planned'],
'requested_date': rate.get('date_delivered', False),
'transit_days': rate.get('transit_days', 0),
})
except (UserError, ValidationError) as e:
_logger.warning('Exception during delivery planning. %s' % str(e))
return planner
@api.model

1
stock_delivery_planner/wizard/stock_delivery_planner_views.xml
View File

@@ -11,6 +11,7 @@
<field name="plan_option_ids" nolabel="1">
<tree decoration-info="selection == 'selected'"
decoration-muted="selection == 'deselected'"
decoration-bf="days_different == 0.0"
default_order="package_id, price"
create="false" edit="false" delete="false">
<field name="package_id" />