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

Merge branch '11.0' into 11.0-test

Browse Source
This commit is contained in:
Jared Kipe
2022-03-11 09:00:03 -08:00
parent 59b49731a4 35b68e7708
commit 574f7a27c6
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
delivery_ups_hibou/models/ups_request_patch.py
View File

@@ -165,13 +165,12 @@ def patched_get_shipping_price(self, shipment_info, packages, shipper, ship_from
_logger.warning('exception during the UPS Time In Transit request. ' + str(e))
tnt_ready = False
tnt_response = '-1'
if tnt_ready and hasattr(tnt_response, 'TransitReponse') and hasattr(tnt_response.TransitResponse, 'ServiceSummary'):
if tnt_ready and hasattr(tnt_response, 'TransitResponse') and hasattr(tnt_response.TransitResponse, 'ServiceSummary'):
for service in tnt_response.TransitResponse.ServiceSummary:
if TNT_CODE_MAP.get(service.Service.Code) == service_type:
if TNT_CODE_MAP.get(service.Service.Code) == res['service_code']:
if hasattr(service, 'EstimatedArrival') and hasattr(service.EstimatedArrival, 'BusinessDaysInTransit'):
res['transit_days'] = int(service.EstimatedArrival.BusinessDaysInTransit)
break
# use TNT API to
result.append(res)
else:
result = {}

13
stock_delivery_planner/wizard/stock_delivery_planner.py
View File

@@ -23,10 +23,9 @@ class StockDeliveryPlanner(models.TransientModel):
selected_options = wiz.plan_option_ids.filtered(lambda p: p.selection == 'selected')
wiz.packages_planned = len(selected_options) == len(packages)
def create(self, values):
planner = super(StockDeliveryPlanner, self).create(values)
base_carriers = planner.picking_id.picking_type_id.warehouse_id.delivery_planner_carrier_ids
def _get_carriers(self):
self.ensure_one()
base_carriers = self.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:
@@ -35,7 +34,11 @@ class StockDeliveryPlanner(models.TransientModel):
base_carriers = base_carriers.browse(carrier_ids)
except:
pass
base_carriers = base_carriers.sudo()
return base_carriers.sudo()
def create(self, values):
planner = super(StockDeliveryPlanner, self).create(values)
base_carriers = planner._get_carriers()
for carrier in base_carriers:
try: