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 'imp/12.0/delivery_gls_nl' into '12.0'

Browse Source 
imp/12.0/delivery_gls_nl into 12.0

See merge request hibou-io/hibou-odoo/suite!698
This commit is contained in:
Jared Kipe
2020-11-24 00:13:42 +00:00
parent 887b6be36e 63dba9134f
commit dd73ca4420
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
delivery_gls_nl/models/delivery_gls_nl.py
View File

@@ -232,21 +232,23 @@ class ProviderGLSNL(models.Model):
# } # }
if picking.package_ids: if picking.package_ids:
for package in picking.package_ids: for package in picking.package_ids:
rate = self._gls_nl_rate(to.country_id.code, package.shipping_weight or 0.0) converted_weight = self._gls_convert_weight(package.shipping_weight)
rate = self._gls_nl_rate(to.country_id.code, converted_weight or 0.0)
if rate and rate != self.GLS_NL_COUNTRY_NOT_FOUND: if rate and rate != self.GLS_NL_COUNTRY_NOT_FOUND:
total_rate += rate total_rate += rate
unit = { unit = {
'unitId': package.name, 'unitId': package.name,
'weight': package.shipping_weight, 'weight': converted_weight
} }
request_body['units'].append(unit) request_body['units'].append(unit)
else: else:
rate = self._gls_nl_rate(to.country_id.code, picking.shipping_weight or 0.0) converted_weight = self._gls_convert_weight(picking.shipping_weight)
rate = self._gls_nl_rate(to.country_id.code, converted_weight or 0.0)
if rate and rate != self.GLS_NL_COUNTRY_NOT_FOUND: if rate and rate != self.GLS_NL_COUNTRY_NOT_FOUND:
total_rate += rate total_rate += rate
unit = { unit = {
'unitId': picking.name, 'unitId': picking.name,
'weight': picking.shipping_weight, 'weight': converted_weight,
} }
request_body['units'].append(unit) request_body['units'].append(unit)
@@ -292,3 +294,11 @@ class ProviderGLSNL(models.Model):
picking.write({'carrier_tracking_ref': '', 'carrier_price': 0.0}) picking.write({'carrier_tracking_ref': '', 'carrier_price': 0.0})
except HTTPError as e: except HTTPError as e:
raise ValidationError(e) raise ValidationError(e)
def _gls_convert_weight(self, weight):
get_param = self.env['ir.config_parameter'].sudo().get_param
product_weight_in_lbs_param = get_param('product.weight_in_lbs')
if product_weight_in_lbs_param == '1':
return weight / 2.20462
else:
return weight