diff --git a/.gitmodules b/.gitmodules index e3c0dec6..ed7e540e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -29,3 +29,9 @@ [submodule "external/hibou-shipbox"] path = external/hibou-shipbox url = https://github.com/hibou-io/shipbox.git +[submodule "external/hibou-oca/purchase-workflow"] + path = external/hibou-oca/purchase-workflow + url = https://github.com/hibou-io/oca-purchase-workflow.git +[submodule "external/hibou-oca/stock-logistics-workflow"] + path = external/hibou-oca/stock-logistics-workflow + url = https://github.com/hibou-io/oca-stock-logistics-workflow.git diff --git a/account_us_wa_salestax/__init__.py b/account_us_wa_salestax/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/account_us_wa_salestax/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_us_wa_salestax/__manifest__.py b/account_us_wa_salestax/__manifest__.py new file mode 100644 index 00000000..3bf44876 --- /dev/null +++ b/account_us_wa_salestax/__manifest__.py @@ -0,0 +1,13 @@ +{'name': 'US WA State SalesTax API', + 'version': '10.0.1.0.0', + 'category': 'Tools', + 'depends': ['account', + ], + 'author': 'Hibou Corp.', + 'license': 'AGPL-3', + 'website': 'https://hibou.io/', + 'data': ['views/account_fiscal_position_view.xml', + ], + 'installable': True, + 'application': False, + } diff --git a/account_us_wa_salestax/models/__init__.py b/account_us_wa_salestax/models/__init__.py new file mode 100644 index 00000000..d0e78197 --- /dev/null +++ b/account_us_wa_salestax/models/__init__.py @@ -0,0 +1,2 @@ +from . import account_fiscal_position +from . import wa_tax_request diff --git a/account_us_wa_salestax/models/account_fiscal_position.py b/account_us_wa_salestax/models/account_fiscal_position.py new file mode 100644 index 00000000..cdaa0738 --- /dev/null +++ b/account_us_wa_salestax/models/account_fiscal_position.py @@ -0,0 +1,78 @@ +from odoo import api, fields, models +from odoo.exceptions import ValidationError + +from .wa_tax_request import WATaxRequest + + +class AccountFiscalPosition(models.Model): + _inherit = 'account.fiscal.position' + + is_us_wa = fields.Boolean(string='Use WA State API') + wa_base_tax_id = fields.Many2one('account.tax', string='WA Base/Error Tax') + + @api.multi + def map_tax(self, taxes, product=None, partner=None): + + if not taxes or not self.is_us_wa or partner is None: + return super(AccountFiscalPosition, self).map_tax(taxes) + + AccountTax = self.env['account.tax'].sudo() + result = AccountTax.browse() + + for tax in taxes: + # step 1: If we were to save the location code on the partner we might not have to do this + request = WATaxRequest() + res = request.get_rate(partner) + wa_tax = None + if not request.is_success(res): + # Cache. + wa_tax = AccountTax.search([ + ('wa_location_zips', 'like', '%' + partner.zip + '%'), + ('amount_type', '=', 'percent'), + ('type_tax_use', '=', 'sale')], limit=1) + if not wa_tax: + result |= self.wa_base_tax_id + continue + + # step 2: Find or create tax + if not wa_tax: + wa_tax = AccountTax.search([ + ('wa_location_code', '=', res['location_code']), + ('amount', '=', res['rate']), + ('amount_type', '=', 'percent'), + ('type_tax_use', '=', 'sale')], limit=1) + if not wa_tax: + wa_tax = AccountTax.create({ + 'name': '%s - WA Tax %s %%' % (res['location_code'], res['rate']), + 'wa_location_code': res['location_code'], + 'amount': res['rate'], + 'amount_type': 'percent', + 'type_tax_use': 'sale', + 'account_id': self.wa_base_tax_id.account_id.id, + 'refund_account_id': self.wa_base_tax_id.refund_account_id.id + }) + + if not wa_tax.wa_location_zips: + wa_tax.wa_location_zips = partner.zip + elif not wa_tax.wa_location_zips.find(partner.zip) >= 0: + zips = wa_tax.wa_location_zips.split(',') + zips.append(partner.zip) + wa_tax.wa_location_zips = zips.append(',') + + # step 3: Find or create mapping + tax_line = self.tax_ids.filtered(lambda x: x.tax_src_id.id == tax.id and x.tax_dest_id.id == wa_tax.id) + if not tax_line: + tax_line = self.env['account.fiscal.position.tax'].sudo().create({ + 'position_id': self.id, + 'tax_src_id': tax.id, + 'tax_dest_id': wa_tax.id, + }) + + result |= tax_line.tax_dest_id + return result + +class AccountTax(models.Model): + _inherit = 'account.tax' + + wa_location_code = fields.Integer('WA Location Code') + wa_location_zips = fields.Char('WA Location ZIPs', default='') diff --git a/account_us_wa_salestax/models/wa_tax_request.py b/account_us_wa_salestax/models/wa_tax_request.py new file mode 100644 index 00000000..e9f0242f --- /dev/null +++ b/account_us_wa_salestax/models/wa_tax_request.py @@ -0,0 +1,74 @@ +from urllib.request import urlopen, quote +from urllib.error import HTTPError +from ssl import _create_unverified_context +from logging import getLogger + +from odoo.exceptions import ValidationError + +_logger = getLogger(__name__) + + +class WATaxRequest(object): + def __init__(self): + pass + + def get_rate(self, partner): + # https://webgis.dor.wa.gov/webapi/addressrates.aspx/?output=text\&addr=test\&city=Marysville\&zip=98270 + if not all((partner.street, partner.city, partner.zip)): + raise ValidationError('WATaxRequest impossible without Street, City and ZIP.') + url = 'https://webgis.dor.wa.gov/webapi/addressrates.aspx?output=text&addr=' + quote(partner.street) + \ + '&city=' + quote(partner.city) + '&zip=' + quote(partner.zip) + _logger.info(url) + try: + response = urlopen(url, context=_create_unverified_context()) + response_body = response.read() + _logger.info(response_body) + except HTTPError as e: + _logger.warn('Error on request: ' + str(e)) + response_body = '' + + return self._parse_rate(response_body) + + def is_success(self, result): + ''' + ADDRESS = 0, + LATLON = 0, + PLUS4 = 1, + ADDRESS_STANARDIZED = 2, + PLUS4_STANARDIZED = 3, + ADDRESS_CHANGED = 4, + ZIPCODE = 5, + ADDRESS_NOT_FOUND = 6, + LATLON_NOT_FOUND = 7, + POI = 8, + ERROR = 9 + internal parse_error = 100 + ''' + if 'result_code' not in result or result['result_code'] >= 9 or result['result_code'] < 0: + return False + return True + + def _parse_rate(self, response_body): + # 'LocationCode=1704 Rate=0.100 ResultCode=0' + # { + # 'result_code': 0, + # 'location_code': '1704', + # 'rate': '10.00', + # } + + res = {'result_code': 100} + if len(response_body) > 200: + # this likely means that they returned an HTML page + return res + + body_parts = response_body.decode().split(' ') + for part in body_parts: + if part.find('ResultCode=') >= 0: + res['result_code'] = int(part[len('ResultCode='):]) + elif part.find('Rate=') >= 0: + res['rate'] = '%.2f' % (float(part[len('Rate='):]) * 100.0) + elif part.find('LocationCode=') >= 0: + res['location_code'] = part[len('LocationCode='):] + elif part.find('debughint=') >= 0: + res['debug_hint'] = part[len('debughint='):] + return res diff --git a/account_us_wa_salestax/views/account_fiscal_position_view.xml b/account_us_wa_salestax/views/account_fiscal_position_view.xml new file mode 100644 index 00000000..59ae7989 --- /dev/null +++ b/account_us_wa_salestax/views/account_fiscal_position_view.xml @@ -0,0 +1,28 @@ + + + + + account.fiscal.position.form.inherit + account.fiscal.position + + + + + + + + + + + account.tax.form.inherit + account.tax + + + + + + + + + + diff --git a/auditlog b/auditlog new file mode 120000 index 00000000..7d9f602f --- /dev/null +++ b/auditlog @@ -0,0 +1 @@ +external/hibou-oca/server-tools/auditlog \ No newline at end of file diff --git a/connector_magento_product_by_sku b/connector_magento_product_by_sku new file mode 120000 index 00000000..1b7f87bd --- /dev/null +++ b/connector_magento_product_by_sku @@ -0,0 +1 @@ +external/hibou-oca/connector-magento/connector_magento_product_by_sku \ No newline at end of file diff --git a/delivery_stamps/__init__.py b/delivery_stamps/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/delivery_stamps/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/delivery_stamps/__manifest__.py b/delivery_stamps/__manifest__.py new file mode 100644 index 00000000..6a16401d --- /dev/null +++ b/delivery_stamps/__manifest__.py @@ -0,0 +1,26 @@ +{ + 'name': 'Stamps.com (USPS) Shipping', + 'summary': 'Send your shippings through Stamps.com and track them online.', + 'version': '11.0.1.0.0', + 'author': "Hibou Corp.", + 'category': 'Warehouse', + 'license': 'AGPL-3', + 'images': [], + 'website': "https://hibou.io", + 'description': """ +Stamps.com (USPS) Shipping +========================== + +Send your shippings through Stamps.com and track them online. + +""", + 'depends': [ + 'delivery', + ], + 'demo': [], + 'data': [ + 'views/delivery_stamps_view.xml', + ], + 'auto_install': False, + 'installable': True, +} diff --git a/delivery_stamps/models/__init__.py b/delivery_stamps/models/__init__.py new file mode 100644 index 00000000..d675855d --- /dev/null +++ b/delivery_stamps/models/__init__.py @@ -0,0 +1 @@ +from . import delivery_stamps diff --git a/delivery_stamps/models/api/LICENSE b/delivery_stamps/models/api/LICENSE new file mode 100755 index 00000000..7276b0b2 --- /dev/null +++ b/delivery_stamps/models/api/LICENSE @@ -0,0 +1,31 @@ +Copyright (c) 2014 by Jonathan Zempel. + +Some rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + +* The names of the contributors may not be used to endorse or + promote products derived from this software without specific + prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/delivery_stamps/models/api/__init__.py b/delivery_stamps/models/api/__init__.py new file mode 100755 index 00000000..0654679c --- /dev/null +++ b/delivery_stamps/models/api/__init__.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +""" + stamps + ~~~~~~ + + Stamps.com API. + + :copyright: 2014 by Jonathan Zempel. + :license: BSD, see LICENSE for more details. +""" + +__author__ = "Jonathan Zempel" +__license__ = "BSD" +__version__ = "0.9.1" diff --git a/delivery_stamps/models/api/config.py b/delivery_stamps/models/api/config.py new file mode 100755 index 00000000..4665780f --- /dev/null +++ b/delivery_stamps/models/api/config.py @@ -0,0 +1,102 @@ +# -*- coding: utf-8 -*- +""" + stamps.config + ~~~~~~~~~~~~~ + + Stamps.com configuration. + + :copyright: 2014 by Jonathan Zempel. + :license: BSD, see LICENSE for more details. +""" + +from configparser import NoOptionError, NoSectionError, SafeConfigParser +from urllib.request import pathname2url +from urllib.parse import urljoin +import os + + +VERSION = 49 + + +class StampsConfiguration(object): + """Stamps service configuration. The service configuration may be provided + directly via parameter values, or it can be read from a configuration file. + If no parameters are given, the configuration will attempt to read from a + ``'.stamps.cfg'`` file in the user's HOME directory. Alternately, a + configuration filename can be passed to the constructor. + + Here is a sample configuration (by default the constructor reads from a + ``'default'`` section):: + + [default] + integration_id = XXXXXXXX-1111-2222-3333-YYYYYYYYYYYY + username = stampy + password = secret + + :param integration_id: Default `None`. Unique ID, provided by Stamps.com, + that represents your application. + :param username: Default `None`. Stamps.com account username. + :param password: Default `None`. Stamps.com password. + :param wsdl: Default `None`. WSDL URI. Use ``'testing'`` to use the test + server WSDL. + :param port: Default `None`. The name of the WSDL port to use. + :param file_name: Default `None`. Optional configuration file name. + :param section: Default ``'default'``. The configuration section to use. + """ + + def __init__(self, integration_id=None, username=None, password=None, + wsdl=None, port=None, file_name=None, section="default"): + parser = SafeConfigParser() + + if file_name: + parser.read([file_name]) + else: + parser.read([os.path.expanduser("~/.stamps.cfg")]) + + self.integration_id = self.__get(parser, section, "integration_id", + integration_id) + self.username = self.__get(parser, section, "username", username) + self.password = self.__get(parser, section, "password", password) + self.wsdl = self.__get(parser, section, "wsdl", wsdl) + self.port = self.__get(parser, section, "port", port) + + if self.wsdl is None or wsdl == "testing": + file_path = os.path.abspath(__file__) + directory_path = os.path.dirname(file_path) + + if wsdl == "testing": + file_name = "stamps_v{0}.test.wsdl".format(VERSION) + else: + file_name = "stamps_v{0}.wsdl".format(VERSION) + + wsdl = os.path.join(directory_path, "wsdls", file_name) + self.wsdl = urljoin("file:", pathname2url(wsdl)) + + if self.port is None: + self.port = "SwsimV{0}Soap12".format(VERSION) + + assert self.integration_id + assert self.username + assert self.password + assert self.wsdl + assert self.port + + @staticmethod + def __get(parser, section, name, default): + """Get a configuration value for the named section. + + :param parser: The configuration parser. + :param section: The section for the given name. + :param name: The name of the value to retrieve. + """ + if default: + vars = {name: default} + else: + vars = None + + try: + ret_val = parser.get(section, name, vars=vars) + except (NoSectionError, NoOptionError): + ret_val = default + + return ret_val diff --git a/delivery_stamps/models/api/services.py b/delivery_stamps/models/api/services.py new file mode 100755 index 00000000..1f7b350a --- /dev/null +++ b/delivery_stamps/models/api/services.py @@ -0,0 +1,298 @@ +# -*- coding: utf-8 -*- +""" + stamps.services + ~~~~~~~~~~~~~~~ + + Stamps.com services. + + :copyright: 2014 by Jonathan Zempel. + :license: BSD, see LICENSE for more details. +""" + +from decimal import Decimal +from logging import getLogger +from re import compile +from suds import WebFault +from suds.bindings.document import Document +from suds.client import Client +from suds.plugin import MessagePlugin +from suds.sax.element import Element +from suds.sudsobject import asdict +from suds.xsd.sxbase import XBuiltin +from suds.xsd.sxbuiltin import Factory + + +PATTERN_HEX = r"[0-9a-fA-F]" +PATTERN_ID = r"{hex}{{8}}-{hex}{{4}}-{hex}{{4}}-{hex}{{4}}-{hex}{{12}}".format( + hex=PATTERN_HEX) +RE_TRANSACTION_ID = compile(PATTERN_ID) + + +class AuthenticatorPlugin(MessagePlugin): + """Handle message authentication. + + :param credentials: Stamps API credentials. + :param wsdl: Configured service client. + """ + + def __init__(self, credentials, client): + self.credentials = credentials + self.client = client + self.authenticator = None + + def marshalled(self, context): + """Add an authenticator token to the document before it is sent. + + :param context: The current message context. + """ + body = context.envelope.getChild("Body") + operation = body[0] + + if operation.name in ("AuthenticateUser", "RegisterAccount"): + pass + elif self.authenticator: + namespace = operation.namespace() + element = Element("Authenticator", ns=namespace) + element.setText(self.authenticator) + operation.insert(element) + else: + document = Document(self.client.wsdl) + method = self.client.service.AuthenticateUser.method + parameter = document.param_defs(method)[0] + element = document.mkparam(method, parameter, self.credentials) + operation.insert(element) + + def unmarshalled(self, context): + """Store the authenticator token for the next call. + + :param context: The current message context. + """ + if hasattr(context.reply, "Authenticator"): + self.authenticator = context.reply.Authenticator + del context.reply.Authenticator + else: + self.authenticator = None + + return context + + +class BaseService(object): + """Base service. + + :param configuration: API configuration. + """ + + def __init__(self, configuration): + Factory.maptag("decimal", XDecimal) + self.client = Client(configuration.wsdl) + credentials = self.create("Credentials") + credentials.IntegrationID = configuration.integration_id + credentials.Username = configuration.username + credentials.Password = configuration.password + self.plugin = AuthenticatorPlugin(credentials, self.client) + self.client.set_options(plugins=[self.plugin], port=configuration.port) + self.logger = getLogger("stamps") + + def call(self, method, **kwargs): + """Call the given web service method. + + :param method: The name of the web service operation to call. + :param kwargs: Method keyword-argument parameters. + """ + self.logger.debug("%s(%s)", method, kwargs) + instance = getattr(self.client.service, method) + + try: + ret_val = instance(**kwargs) + except WebFault as error: + self.logger.warning("Retry %s", method, exc_info=True) + self.plugin.authenticator = None + + try: # retry with a re-authenticated user. + ret_val = instance(**kwargs) + except WebFault as error: + self.logger.exception("%s retry failed", method) + self.plugin.authenticator = None + raise error + + return ret_val + + def create(self, wsdl_type): + """Create an object of the given WSDL type. + + :param wsdl_type: The WSDL type to create an object for. + """ + return self.client.factory.create(wsdl_type) + + +class StampsService(BaseService): + """Stamps.com service. + """ + + def add_postage(self, amount, transaction_id=None): + """Add postage to the account. + + :param amount: The amount of postage to purchase. + :param transaction_id: Default `None`. ID that may be used to retry the + purchase of this postage. + """ + account = self.get_account() + control = account.AccountInfo.PostageBalance.ControlTotal + + return self.call("PurchasePostage", PurchaseAmount=amount, + ControlTotal=control, IntegratorTxID=transaction_id) + + def create_add_on(self): + """Create a new add-on object. + """ + return self.create("AddOnV7") + + def create_customs(self): + """Create a new customs object. + """ + return self.create("CustomsV3") + + def create_array_of_customs_lines(self): + """Create a new array of customs objects. + """ + return self.create("ArrayOfCustomsLine") + + def create_customs_lines(self): + """Create new customs lines. + """ + return self.create("CustomsLine") + + def create_address(self): + """Create a new address object. + """ + return self.create("Address") + + def create_purchase_status(self): + """Create a new purchase status object. + """ + return self.create("PurchaseStatus") + + def create_registration(self): + """Create a new registration object. + """ + ret_val = self.create("RegisterAccount") + ret_val.IntegrationID = self.plugin.credentials.IntegrationID + ret_val.UserName = self.plugin.credentials.Username + ret_val.Password = self.plugin.credentials.Password + + return ret_val + + def create_shipping(self): + """Create a new shipping object. + """ + return self.create("RateV18") + + def get_address(self, address): + """Get a shipping address. + + :param address: Address instance to get a clean shipping address for. + """ + return self.call("CleanseAddress", Address=address) + + def get_account(self): + """Get account information. + """ + return self.call("GetAccountInfo") + + def get_label(self, from_address, to_address, rate, transaction_id, image_type=None, + customs=None, sample=False): + """Get a shipping label. + + :param from_address: The shipping 'from' address. + :param to_address: The shipping 'to' address. + :param rate: A rate instance for the shipment. + :param transaction_id: ID that may be used to retry/rollback the + purchase of this label. + :param customs: A customs instance for international shipments. + :param sample: Default ``False``. Get a sample label without postage. + """ + return self.call("CreateIndicium", IntegratorTxID=transaction_id, + Rate=rate, From=from_address, To=to_address, ImageType=image_type, Customs=customs, + SampleOnly=sample) + + def get_postage_status(self, transaction_id): + """Get postage purchase status. + + :param transaction_id: The transaction ID returned by + :meth:`add_postage`. + """ + return self.call("GetPurchaseStatus", TransactionID=transaction_id) + + def get_rates(self, shipping): + """Get shipping rates. + + :param shipping: Shipping instance to get rates for. + """ + rates = self.call("GetRates", Rate=shipping) + + if rates.Rates: + ret_val = [rate for rate in rates.Rates.Rate] + else: + ret_val = [] + + return ret_val + + def get_tracking(self, transaction_id): + """Get tracking events for a shipment. + + :param transaction_id: The transaction ID (or tracking number) returned + by :meth:`get_label`. + """ + if RE_TRANSACTION_ID.match(transaction_id): + arguments = dict(StampsTxID=transaction_id) + else: + arguments = dict(TrackingNumber=transaction_id) + + return self.call("TrackShipment", **arguments) + + def register_account(self, registration): + """Register a new account. + + :param registration: Registration instance. + """ + arguments = asdict(registration) + + return self.call("RegisterAccount", **arguments) + + def remove_label(self, transaction_id): + """Cancel a shipping label. + + :param transaction_id: The transaction ID (or tracking number) returned + by :meth:`get_label`. + """ + if RE_TRANSACTION_ID.match(transaction_id): + arguments = dict(StampsTxID=transaction_id) + else: + arguments = dict(TrackingNumber=transaction_id) + + return self.call("CancelIndicium", **arguments) + + +class XDecimal(XBuiltin): + """Represents an XSD decimal type. + """ + + def translate(self, value, topython=True): + """Translate between string and decimal values. + + :param value: The value to translate. + :param topython: Default `True`. Determine whether to translate the + value for python. + """ + if topython: + if isinstance(value, str) and len(value): + ret_val = Decimal(value) + else: + ret_val = None + else: + if isinstance(value, (int, float, Decimal)): + ret_val = str(value) + else: + ret_val = value + + return ret_val diff --git a/delivery_stamps/models/api/tests.py b/delivery_stamps/models/api/tests.py new file mode 100755 index 00000000..6a306ccd --- /dev/null +++ b/delivery_stamps/models/api/tests.py @@ -0,0 +1,149 @@ +# -*- coding: utf-8 -*- +""" + stamps.tests + ~~~~~~~~~~~~ + + Stamps.com API tests. + + :copyright: 2014 by Jonathan Zempel. + :license: BSD, see LICENSE for more details. +""" + +from .config import StampsConfiguration +from .services import StampsService +from datetime import date, datetime +from time import sleep +from unittest import TestCase +import logging +import os + + +logging.basicConfig() +logging.getLogger("suds.client").setLevel(logging.DEBUG) +file_path = os.path.abspath(__file__) +directory_path = os.path.dirname(file_path) +file_name = os.path.join(directory_path, "tests.cfg") +CONFIGURATION = StampsConfiguration(wsdl="testing", file_name=file_name) + + +def get_rate(service): + """Get a test rate. + + :param service: Instance of the stamps service. + """ + ret_val = service.create_shipping() + ret_val.ShipDate = date.today().isoformat() + ret_val.FromZIPCode = "94107" + ret_val.ToZIPCode = "20500" + ret_val.PackageType = "Package" + rate = service.get_rates(ret_val)[0] + ret_val.Amount = rate.Amount + ret_val.ServiceType = rate.ServiceType + ret_val.DeliverDays = rate.DeliverDays + ret_val.DimWeighting = rate.DimWeighting + ret_val.Zone = rate.Zone + ret_val.RateCategory = rate.RateCategory + ret_val.ToState = rate.ToState + add_on = service.create_add_on() + add_on.AddOnType = "US-A-DC" + ret_val.AddOns.AddOnV7.append(add_on) + + return ret_val + + +def get_from_address(service): + """Get a test 'from' address. + + :param service: Instance of the stamps service. + """ + address = service.create_address() + address.FullName = "Pickwick & Weller" + address.Address1 = "300 Brannan St." + address.Address2 = "Suite 405" + address.City = "San Francisco" + address.State = "CA" + + return service.get_address(address).Address + + +def get_to_address(service): + """Get a test 'to' address. + + :param service: Instance of the stamps service. + """ + address = service.create_address() + address.FullName = "POTUS" + address.Address1 = "1600 Pennsylvania Avenue NW" + address.City = "Washington" + address.State = "DC" + + return service.get_address(address).Address + + +class StampsTestCase(TestCase): + + initialized = False + + def setUp(self): + if not StampsTestCase.initialized: + self.service = StampsService(CONFIGURATION) + StampsTestCase.initalized = True + + def _test_0(self): + """Test account registration. + """ + registration = self.service.create_registration() + type = self.service.create("CodewordType") + registration.Codeword1Type = type.Last4SocialSecurityNumber + registration.Codeword1 = 1234 + registration.Codeword2Type = type.Last4DriversLicense + registration.Codeword2 = 1234 + registration.PhysicalAddress = get_from_address(self.service) + registration.MachineInfo.IPAddress = "127.0.0.1" + registration.Email = "sws-support@stamps.com" + type = self.service.create("AccountType") + registration.AccountType = type.OfficeBasedBusiness + result = self.service.register_account(registration) + print result + + def _test_1(self): + """Test postage purchase. + """ + transaction_id = datetime.now().isoformat() + result = self.service.add_postage(10, transaction_id=transaction_id) + transaction_id = result.TransactionID + status = self.service.create_purchase_status() + seconds = 4 + + while result.PurchaseStatus in (status.Pending, status.Processing): + seconds = 32 if seconds * 2 >= 32 else seconds * 2 + print "Waiting {0:d} seconds to get status...".format(seconds) + sleep(seconds) + result = self.service.get_postage_status(transaction_id) + + print result + + def test_2(self): + """Test label generation. + """ + self.service = StampsService(CONFIGURATION) + rate = get_rate(self.service) + from_address = get_from_address(self.service) + to_address = get_to_address(self.service) + transaction_id = datetime.now().isoformat() + label = self.service.get_label(from_address, to_address, rate, + transaction_id=transaction_id) + self.service.get_tracking(label.StampsTxID) + self.service.get_tracking(label.TrackingNumber) + self.service.remove_label(label.StampsTxID) + print label + + def test_3(self): + """Test authentication retry. + """ + self.service.get_account() + authenticator = self.service.plugin.authenticator + self.service.get_account() + self.service.plugin.authenticator = authenticator + result = self.service.get_account() + print result diff --git a/delivery_stamps/models/api/wsdls/stamps_v49.test.wsdl b/delivery_stamps/models/api/wsdls/stamps_v49.test.wsdl new file mode 100755 index 00000000..7fde531e --- /dev/null +++ b/delivery_stamps/models/api/wsdls/stamps_v49.test.wsdl @@ -0,0 +1,3381 @@ + + + Stamps.com Web Services for Individual Meters (SWS/IM) Version 49 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Get list of shipments. + + + + + Set CodeWord information + + + + + Register a new Stamps.com account. + + + + + Generate an envelope indicium. + + + + + Generate an indicium. + + + + + Generate an unfunded indicium. + + + + + Generate a mailing label sheet. + + + + + Generate NetStamps indicia. + + + + + Calculate a rate or a list of rates. + + + + + Request carrier pickup from USPS. + + + + + Change Plan. + + + + + Set auto-buy settings + + + + + Generate a SCAN form. + + + + + Return the list of available CodeWord types. + + + + + Cleanse an address. + + + + + Get list of shipments. + + + + + Get URL for a Stamps.com web page. + + + + + Recover Username. + + + + + Get list of supported countries. + + + + + Change Password. + + + + + Price Store Orders. + + + + + Place Store Orders. + + + + + Get NetStamps Images. + + + + + Get status of plan change. + + + + + Purchase additional postage. + + + + + Resubmit Purchase. + + + + + Get list of NetStamps layouts. + + + + + Get list of cost codes. + + + + + Authenticate with transfer authenticator. + + + + + Cancel a previously issued indicium. + + + + + Start a password reset by sending a temporary password to the e-mail address on file. + + + + + Finish a password reset, setting the permanent password to a new password. + + + + + Retrieve codeword questions for user for starting password reset. + + + + + Void an unfunded indicium. + + + + + Fund an unfunded indicium. + + + + + Initial authentication. + + + + + Get account information, including postage balance. + + + + + Get status of postage purchase. + + + + + Get tracking events for shipment. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Stamps.com Web Services for Individual Meters (SWS/IM) Version 49 + + + + + + + + diff --git a/delivery_stamps/models/api/wsdls/stamps_v49.wsdl b/delivery_stamps/models/api/wsdls/stamps_v49.wsdl new file mode 100755 index 00000000..d8948f7e --- /dev/null +++ b/delivery_stamps/models/api/wsdls/stamps_v49.wsdl @@ -0,0 +1,3381 @@ + + + Stamps.com Web Services for Individual Meters (SWS/IM) Version 49 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Get list of shipments. + + + + + Set CodeWord information + + + + + Register a new Stamps.com account. + + + + + Generate an envelope indicium. + + + + + Generate an indicium. + + + + + Generate an unfunded indicium. + + + + + Generate a mailing label sheet. + + + + + Generate NetStamps indicia. + + + + + Calculate a rate or a list of rates. + + + + + Request carrier pickup from USPS. + + + + + Change Plan. + + + + + Set auto-buy settings + + + + + Generate a SCAN form. + + + + + Return the list of available CodeWord types. + + + + + Cleanse an address. + + + + + Get list of shipments. + + + + + Get URL for a Stamps.com web page. + + + + + Recover Username. + + + + + Get list of supported countries. + + + + + Change Password. + + + + + Price Store Orders. + + + + + Place Store Orders. + + + + + Get NetStamps Images. + + + + + Get status of plan change. + + + + + Purchase additional postage. + + + + + Resubmit Purchase. + + + + + Get list of NetStamps layouts. + + + + + Get list of cost codes. + + + + + Authenticate with transfer authenticator. + + + + + Cancel a previously issued indicium. + + + + + Start a password reset by sending a temporary password to the e-mail address on file. + + + + + Finish a password reset, setting the permanent password to a new password. + + + + + Retrieve codeword questions for user for starting password reset. + + + + + Void an unfunded indicium. + + + + + Fund an unfunded indicium. + + + + + Initial authentication. + + + + + Get account information, including postage balance. + + + + + Get status of postage purchase. + + + + + Get tracking events for shipment. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Stamps.com Web Services for Individual Meters (SWS/IM) Version 49 + + + + + + + + diff --git a/delivery_stamps/models/delivery_stamps.py b/delivery_stamps/models/delivery_stamps.py new file mode 100644 index 00000000..9965320d --- /dev/null +++ b/delivery_stamps/models/delivery_stamps.py @@ -0,0 +1,297 @@ +from datetime import date +from logging import getLogger +from urllib.request import urlopen +from suds import WebFault + +from odoo import api, fields, models, _ +from odoo.exceptions import ValidationError + +from .api.config import StampsConfiguration +from .api.services import StampsService + +_logger = getLogger(__name__) + +STAMPS_PACKAGE_TYPES = [ + 'Unknown', + 'Postcard', + 'Letter', + 'Large Envelope or Flat', + 'Thick Envelope', + 'Package', + 'Flat Rate Box', + 'Small Flat Rate Box', + 'Large Flat Rate Box', + 'Flat Rate Envelope', + 'Flat Rate Padded Envelope', + 'Large Package', + 'Oversized Package', + 'Regional Rate Box A', + 'Regional Rate Box B', + 'Legal Flat Rate Envelope', + 'Regional Rate Box C', +] + + +class ProductPackaging(models.Model): + _inherit = 'product.packaging' + + package_carrier_type = fields.Selection(selection_add=[('stamps', 'Stamps.com')]) + + +class ProviderStamps(models.Model): + _inherit = 'delivery.carrier' + + delivery_type = fields.Selection(selection_add=[('stamps', 'Stamps.com (USPS)')]) + + stamps_integration_id = fields.Char(string='Stamps.com Integration ID', groups='base.group_system') + stamps_username = fields.Char(string='Stamps.com Username', groups='base.group_system') + stamps_password = fields.Char(string='Stamps.com Password', groups='base.group_system') + + stamps_service_type = fields.Selection([('US-FC', 'First-Class'), + ('US-PM', 'Priority'), + ], + required=True, string="Service Type", default="US-PM") + stamps_default_packaging_id = fields.Many2one('product.packaging', string='Default Package Type') + + stamps_image_type = fields.Selection([('Auto', 'Auto'), + ('Png', 'PNG'), + ('Gif', 'GIF'), + ('Pdf', 'PDF'), + ('Epl', 'EPL'), + ('Jpg', 'JPG'), + ('PrintOncePdf', 'Print Once PDF'), + ('EncryptedPngUrl', 'Encrypted PNG URL'), + ('Zpl', 'ZPL'), + ('AZpl', 'AZPL'), + ('BZpl', 'BZPL'), + ], + required=True, string="Image Type", default="Pdf") + + def _stamps_package_type(self, package=None): + if not package: + return self.stamps_default_packaging_id.shipper_package_code + return package.packaging_id.shipper_package_code if package.packaging_id.shipper_package_code in STAMPS_PACKAGE_TYPES else 'Package' + + def _get_stamps_service(self): + sudoself = self.sudo() + config = StampsConfiguration(integration_id=sudoself.stamps_integration_id, + username=sudoself.stamps_username, + password=sudoself.stamps_password) + return StampsService(configuration=config) + + def _stamps_convert_weight(self, weight): + """ weight always expressed in KG """ + if self.stamps_default_packaging_id.max_weight and self.stamps_default_packaging_id.max_weight < weight: + raise ValidationError('Stamps cannot ship for weight: ' + str(weight) + 'kgs.') + + weight_in_pounds = weight * 2.20462 + return weight_in_pounds + + def _get_stamps_shipping_for_order(self, service, order, date_planned): + weight = sum([(line.product_id.weight * line.product_qty) for line in order.order_line]) or 0.0 + weight = self._stamps_convert_weight(weight) + + if not all((order.warehouse_id.partner_id.zip, order.partner_shipping_id.zip)): + raise ValidationError('Stamps needs ZIP. From: ' + str(order.warehouse_id.partner_id.zip) + ' To: ' + str(order.partner_shipping_id.zip)) + + ret_val = service.create_shipping() + ret_val.ShipDate = date_planned.split()[0] if date_planned else date.today().isoformat() + ret_val.FromZIPCode = order.warehouse_id.partner_id.zip + ret_val.ToZIPCode = order.partner_shipping_id.zip + ret_val.PackageType = self._stamps_package_type() + ret_val.ServiceType = self.stamps_service_type + ret_val.WeightLb = weight + return ret_val + + def _get_order_for_picking(self, picking): + if picking.sale_id: + return picking.sale_id + return None + + def _get_company_for_order(self, order): + company = order.company_id + if order.team_id and order.team_id.subcompany_id: + company = order.team_id.subcompany_id.company_id + elif order.analytic_account_id and order.analytic_account_id.subcompany_id: + company = order.analytic_account_id.subcompany_id.company_id + return company + + def _get_company_for_picking(self, picking): + order = self._get_order_for_picking(picking) + if order: + return self._get_company_for_order(order) + return picking.company_id + + def _stamps_get_addresses_for_picking(self, picking): + company = self._get_company_for_picking(picking) + from_ = picking.picking_type_id.warehouse_id.partner_id + to = picking.partner_id + return company, from_, to + + def _stamps_get_shippings_for_picking(self, service, picking): + ret = [] + company, from_partner, to_partner = self._stamps_get_addresses_for_picking(picking) + if not all((from_partner.zip, to_partner.zip)): + raise ValidationError('Stamps needs ZIP. From: ' + str(from_partner.zip) + ' To: ' + str(to_partner.zip)) + + for package in picking.package_ids: + weight = self._stamps_convert_weight(package.shipping_weight) + + ret_val = service.create_shipping() + ret_val.ShipDate = date.today().isoformat() + ret_val.FromZIPCode = from_partner.zip + ret_val.ToZIPCode = to_partner.zip + ret_val.PackageType = self._stamps_package_type(package=package) + ret_val.ServiceType = self.stamps_service_type + ret_val.WeightLb = weight + ret.append((package.name + ret_val.ShipDate + str(ret_val.WeightLb), ret_val)) + if not ret: + weight = self._stamps_convert_weight(picking.shipping_weight) + + ret_val = service.create_shipping() + ret_val.ShipDate = date.today().isoformat() + ret_val.FromZIPCode = from_partner.zip + ret_val.ToZIPCode = to_partner.zip + ret_val.PackageType = self._stamps_package_type() + ret_val.ServiceType = self.stamps_service_type + ret_val.WeightLb = weight + ret.append((picking.name + ret_val.ShipDate + str(ret_val.WeightLb), ret_val)) + + return ret + + def stamps_get_shipping_price_from_so(self, orders): + res = self.stamps_get_shipping_price_for_plan(orders, date.today().isoformat()) + return map(lambda r: r[0] if r else 0.0, res) + + def stamps_get_shipping_price_for_plan(self, orders, date_planned): + res = [] + service = self._get_stamps_service() + + for order in orders: + # has product with usps_exclude + if sum(1 for l in order.order_line if l.product_id.usps_exclude): + res.append(None) + continue + + shipping = self._get_stamps_shipping_for_order(service, order, date_planned) + rates = service.get_rates(shipping) + if rates and len(rates) >= 1: + rate = rates[0] + price = float(rate.Amount) + + if order.currency_id.name != 'USD': + quote_currency = self.env['res.currency'].search([('name', '=', 'USD')], limit=1) + price = quote_currency.compute(rate.Amount, order.currency_id) + + delivery_days = rate.DeliverDays + if delivery_days.find('-') >= 0: + delivery_days = delivery_days.split('-') + transit_days = int(delivery_days[-1]) + else: + transit_days = int(delivery_days) + date_delivered = None + if date_planned and transit_days > 0: + date_delivered = self.calculate_date_delivered(date_planned, transit_days) + + res = res + [(price, transit_days, date_delivered)] + continue + res = res + [(0.0, 0, None)] + return res + + def stamps_send_shipping(self, pickings): + res = [] + service = self._get_stamps_service() + + for picking in pickings: + package_labels = [] + + shippings = self._stamps_get_shippings_for_picking(service, picking) + company, from_partner, to_partner = self._stamps_get_addresses_for_picking(picking) + + from_address = service.create_address() + from_address.FullName = company.partner_id.name + from_address.Address1 = from_partner.street + if from_partner.street2: + from_address.Address2 = from_partner.street2 + from_address.City = from_partner.city + from_address.State = from_partner.state_id.code + from_address = service.get_address(from_address).Address + + to_address = service.create_address() + to_address.FullName = to_partner.name + to_address.Address1 = to_partner.street + if to_partner.street2: + to_address.Address2 = to_partner.street2 + to_address.City = to_partner.city + to_address.State = to_partner.state_id.code + to_address = service.get_address(to_address).Address + + try: + for txn_id, shipping in shippings: + rates = service.get_rates(shipping) + if rates and len(rates) >= 1: + rate = rates[0] + shipping.Amount = rate.Amount + shipping.ServiceType = rate.ServiceType + shipping.DeliverDays = rate.DeliverDays + shipping.DimWeighting = rate.DimWeighting + shipping.Zone = rate.Zone + shipping.RateCategory = rate.RateCategory + shipping.ToState = rate.ToState + add_on = service.create_add_on() + add_on.AddOnType = 'US-A-DC' + add_on2 = service.create_add_on() + add_on2.AddOnType = 'SC-A-HP' + shipping.AddOns.AddOnV7 = [add_on, add_on2] + label = service.get_label(from_address, to_address, shipping, + transaction_id=txn_id, image_type=self.stamps_image_type) + package_labels.append((txn_id, label)) + # self.service.get_tracking(label.StampsTxID) + # self.service.get_tracking(label.TrackingNumber) + # self.service.remove_label(label.StampsTxID) + # print label + except WebFault as e: + _logger.warn(e) + if package_labels: + for name, label in package_labels: + body = 'Cancelling due to error: ' + str(label.TrackingNumber) + try: + service.remove_label(label.TrackingNumber) + except WebFault as e: + raise ValidationError(e) + else: + picking.message_post(body=body) + raise ValidationError('Error on full shipment. Attempted to cancel any previously shipped.') + raise ValidationError('Error on shipment. ' + str(e)) + else: + carrier_price = 0.0 + tracking_numbers = [] + for name, label in package_labels: + body = 'Shipment created into Stamps.com
Tracking Number :
' + label.TrackingNumber + '' + tracking_numbers.append(label.TrackingNumber) + carrier_price += float(label.Rate.Amount) + url = label.URL + + response = urlopen(url) + attachment = response.read() + picking.message_post(body=body, attachments=[('LabelStamps-%s.%s' % (label.TrackingNumber, self.stamps_image_type), attachment)]) + shipping_data = {'exact_price': carrier_price, 'tracking_number': ','.join(tracking_numbers)} + res = res + [shipping_data] + return res + + def stamps_get_tracking_link(self, pickings): + res = [] + for picking in pickings: + ref = picking.carrier_tracking_ref + res = res + ['https://tools.usps.com/go/TrackConfirmAction_input?qtc_tLabels1=%s' % ref] + return res + + def stamps_cancel_shipment(self, picking): + service = self._get_stamps_service() + try: + service.remove_label(picking.carrier_tracking_ref) + picking.message_post(body=_(u'Shipment N° %s has been cancelled' % picking.carrier_tracking_ref)) + picking.write({'carrier_tracking_ref': '', + 'carrier_price': 0.0}) + except WebFault as e: + raise ValidationError(e) diff --git a/delivery_stamps/views/delivery_stamps_view.xml b/delivery_stamps/views/delivery_stamps_view.xml new file mode 100644 index 00000000..bb1d07f2 --- /dev/null +++ b/delivery_stamps/views/delivery_stamps_view.xml @@ -0,0 +1,28 @@ + + + + + delivery.carrier.form.provider.stamps + delivery.carrier + + + + + + + + + + + + + + + + + + + + + + diff --git a/external/hibou-oca/purchase-workflow b/external/hibou-oca/purchase-workflow new file mode 160000 index 00000000..5973bb87 --- /dev/null +++ b/external/hibou-oca/purchase-workflow @@ -0,0 +1 @@ +Subproject commit 5973bb878baba5656d08067079e07edd1ec6accc diff --git a/external/hibou-oca/stock-logistics-workflow b/external/hibou-oca/stock-logistics-workflow new file mode 160000 index 00000000..cc0b36e7 --- /dev/null +++ b/external/hibou-oca/stock-logistics-workflow @@ -0,0 +1 @@ +Subproject commit cc0b36e76c9ac0e508ef69edbc5572aaa72030e0 diff --git a/mrp_production_add/README.rst b/mrp_production_add/README.rst new file mode 100755 index 00000000..7032b4b6 --- /dev/null +++ b/mrp_production_add/README.rst @@ -0,0 +1,26 @@ +******************************* +Hibou - MRP Production Add Item +******************************* + +Allows a user to add a new item to an in-progress Manufacturing Order (including generating PO procurements). +For more information and add-ons, visit `Hibou.io `_. + +.. image:: https://cloud.githubusercontent.com/assets/744550/20810612/2f3eb514-b7bf-11e6-838f-6d6efb8f7484.png + :alt: 'MRP Production Add' + :width: 988 + :align: left +============= +Main Features +============= + +* Button above existing Consumed Materials to add new product. +* Uses existing procurement group and routes to procure additional items. + + +======= +Licence +======= + +Please see `LICENSE `_. + +Copyright Hibou Corp. 2016. \ No newline at end of file diff --git a/mrp_production_add/__init__.py b/mrp_production_add/__init__.py new file mode 100755 index 00000000..40272379 --- /dev/null +++ b/mrp_production_add/__init__.py @@ -0,0 +1 @@ +from . import wizard diff --git a/mrp_production_add/__manifest__.py b/mrp_production_add/__manifest__.py new file mode 100755 index 00000000..0cd07a33 --- /dev/null +++ b/mrp_production_add/__manifest__.py @@ -0,0 +1,17 @@ +{ + 'name': 'MRP Production Add Item', + 'author': 'Hibou Corp. ', + 'version': '11.0.1.0.0', + 'category': 'Manufacturing', + 'summary': 'Add Items to an existing Production', + 'description': """ +This module allows a production order to add additional items that are not on the product's BoM. + """, + 'website': 'https://hibou.io/', + 'depends': ['mrp'], + 'data': [ + 'wizard/additem_wizard_view.xml', + 'views/mrp_production.xml', + ], + 'installable': True, +} diff --git a/mrp_production_add/views/mrp_production.xml b/mrp_production_add/views/mrp_production.xml new file mode 100755 index 00000000..73c4aea1 --- /dev/null +++ b/mrp_production_add/views/mrp_production.xml @@ -0,0 +1,21 @@ + + + + + mrp.production.add_production_item.form.view + mrp.production + + + + +