diff --git a/delivery_stamps/__manifest__.py b/delivery_stamps/__manifest__.py index 382e8d60..ee793bd1 100644 --- a/delivery_stamps/__manifest__.py +++ b/delivery_stamps/__manifest__.py @@ -3,7 +3,7 @@ { 'name': 'Stamps.com (USPS) Shipping', 'summary': 'Send your shippings through Stamps.com and track them online.', - 'version': '13.0.1.0.0', + 'version': '14.0.1.0.0', 'author': "Hibou Corp.", 'category': 'Warehouse', 'license': 'OPL-1', diff --git a/delivery_stamps/models/delivery_stamps.py b/delivery_stamps/models/delivery_stamps.py index c9a1829d..2b353076 100644 --- a/delivery_stamps/models/delivery_stamps.py +++ b/delivery_stamps/models/delivery_stamps.py @@ -52,7 +52,8 @@ class ProductPackaging(models.Model): class ProviderStamps(models.Model): _inherit = 'delivery.carrier' - delivery_type = fields.Selection(selection_add=[('stamps', 'Stamps.com (USPS)')]) + delivery_type = fields.Selection(selection_add=[('stamps', 'Stamps.com (USPS)')], + ondelete={'stamps': 'set default'}) stamps_username = fields.Char(string='Stamps.com Username', groups='base.group_system') stamps_password = fields.Char(string='Stamps.com Password', groups='base.group_system') @@ -104,7 +105,8 @@ class ProviderStamps(models.Model): package_type = self.stamps_default_packaging_id else: package_type = package.packaging_id - return package_type.length, package_type.width, package_type.height + # TODO should convert to inches if it is not already + return package_type.packaging_length, package_type.width, package_type.height def _get_stamps_service(self): sudoself = self.sudo() diff --git a/delivery_stamps/views/delivery_stamps_view.xml b/delivery_stamps/views/delivery_stamps_view.xml index 4320c0e2..3508b348 100644 --- a/delivery_stamps/views/delivery_stamps_view.xml +++ b/delivery_stamps/views/delivery_stamps_view.xml @@ -32,7 +32,7 @@ product.packaging - +