Merge branch 'imp/12.0/delivery_hibou_amazon' into '12.0'

RELEASE: imp/12.0/delivery_hibou_amazon

See merge request hibou-io/hibou-odoo/suite!14
This commit is contained in:
Jared Kipe
2019-08-08 17:24:56 +00:00

View File

@@ -13,6 +13,8 @@ class DeliveryCarrier(models.Model):
help='Priority for this carrier. Will affect pickings '
'and procurements related to this carrier.')
# Utility
def get_insurance_value(self, order=None, picking=None):
value = 0.0
if order:
@@ -61,6 +63,16 @@ class DeliveryCarrier(models.Model):
return 'in'
return 'out'
def is_amazon(self, order=None, picking=None):
"""
Amazon MWS orders potentially need to be flagged for
clean up on the carrier's side.
Override to return based on criteria in your company.
:return:
"""
return False
# Shipper Company
def get_shipper_company(self, order=None, picking=None):
@@ -145,8 +157,3 @@ class DeliveryCarrier(models.Model):
def _get_recipient_out(self, picking):
return picking.partner_id